lotek/opensim
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

a few more changes on universal id

Browse Source
This commit is contained in:
UbitUmarov
2022-03-15 02:03:06 +00:00
parent a46f0b4fd4
commit 073098e1b6
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Framework/Util.cs
View File

@@ -3717,7 +3717,7 @@ namespace OpenSim.Framework
int* seps = stackalloc int[3]; int* seps = stackalloc int[3];
int nseps = 0; int nseps = 0;
for (int i = 37; i < value.Length && nseps < 3; ++i) for (int i = 36; i < value.Length && nseps < 3; ++i)
{ {
if (value[i] == ';') if (value[i] == ';')
seps[nseps++] = i; seps[nseps++] = i;
@@ -3792,7 +3792,7 @@ namespace OpenSim.Framework
int* seps = stackalloc int[3]; int* seps = stackalloc int[3];
int nseps = 0; int nseps = 0;
for (int i = 37; i < value.Length && nseps < 3; ++i) for (int i = 36; i < value.Length && nseps < 3; ++i)
{ {
if (value[i] == ';') if (value[i] == ';')
seps[nseps++] = i; seps[nseps++] = i;
@@ -3873,7 +3873,7 @@ namespace OpenSim.Framework
int* seps = stackalloc int[3]; int* seps = stackalloc int[3];
int nseps = 0; int nseps = 0;
for (int i = 37; i < value.Length && nseps < 3; ++i) for (int i = 36; i < value.Length && nseps < 3; ++i)
{ {
if (value[i] == ';') if (value[i] == ';')
seps[nseps++] = i; seps[nseps++] = i;

9
OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs
View File

@@ -179,13 +179,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
{ {
if (finfo.TheirFlags != -1) if (finfo.TheirFlags != -1)
{ {
if (!UUID.TryParse(finfo.Friend, out UUID id)) if (Util.ParseFullUniversalUserIdentifier(finfo.Friend, out UUID id, out string url, out string first, out string last))
{ {
if (Util.ParseFullUniversalUserIdentifier(finfo.Friend, out id, out string url, out string first, out string last)) //m_log.DebugFormat("[HGFRIENDS MODULE]: caching {0}", finfo.Friend);
{ uMan.AddUser(id,first,last, url);
//m_log.DebugFormat("[HGFRIENDS MODULE]: caching {0}", finfo.Friend);
uMan.AddUser(id,first,last, url);
}
} }
} }
} }