ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 01:06:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

mantis 8985, a forgotten commit

Browse Source
This commit is contained in:
UbitUmarov
2022-03-27 21:57:37 +01:00
parent 6155c202a7
commit c49dcc2fe6
1 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
OpenSim/Services/LLLoginService/LLLoginResponse.cs
View File

@@ -779,20 +779,13 @@ namespace OpenSim.Services.LLLoginService
continue;
LLLoginResponse.BuddyList.BuddyInfo buddyitem = new LLLoginResponse.BuddyList.BuddyInfo(finfo.Friend);
// finfo.Friend may not be a simple uuid
UUID friendID = UUID.Zero;
if (UUID.TryParse(finfo.Friend, out friendID))
buddyitem.BuddyID = finfo.Friend;
if (Util.ParseUniversalUserIdentifier(finfo.Friend, out UUID friendID))
buddyitem.BuddyID = friendID.ToString();
else
{
string tmp;
if (Util.ParseUniversalUserIdentifier(finfo.Friend, out friendID, out tmp, out tmp, out tmp, out tmp))
buddyitem.BuddyID = friendID.ToString();
else
// junk entry
continue;
}
buddyitem.BuddyRightsHave = (int)finfo.TheirFlags;
buddyitem.BuddyRightsGiven = (int)finfo.MyFlags;
continue; // junk entry
buddyitem.BuddyRightsHave = finfo.TheirFlags;
buddyitem.BuddyRightsGiven = finfo.MyFlags;
buddylistreturn.AddNewBuddy(buddyitem);
}
return buddylistreturn;