Merge branch 'master' into careminster-presence-refactor

1 files changed, 13 insertions, 1 deletions

diff --git a/OpenSim/Services/LLLoginService/LLLoginResponse.cs b/OpenSim/Services/LLLoginService/LLLoginResponse.cs
index f8868f5..82acfbc 100644
--- a/OpenSim/Services/LLLoginService/LLLoginResponse.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginResponse.cs
@@ -627,7 +627,19 @@ namespace OpenSim.Services.LLLoginService
                 if (finfo.TheirFlags == -1)
                     continue;
                 LLLoginResponse.BuddyList.BuddyInfo buddyitem = new LLLoginResponse.BuddyList.BuddyInfo(finfo.Friend);
-                buddyitem.BuddyID = 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;
+                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;
                 buddylistreturn.AddNewBuddy(buddyitem);