From 62c263d32b1cfb2dfc8e3681ea93f2dd33c077ca Mon Sep 17 00:00:00 2001
From: Homer Horwitz
Date: Mon, 24 Nov 2008 22:07:45 +0000
Subject: WIP: Adding a few things to PresenceModule. Not quite finished yet.

---
 OpenSim/Region/Communications/OGS1/OGS1UserServices.cs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Region/Communications/OGS1')

diff --git a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
index f1e2f04..5f39d8f 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
@@ -770,7 +770,15 @@ namespace OpenSim.Region.Communications.OGS1
                             {
                                 FriendRegionInfo info = new FriendRegionInfo();
                                 info.isOnline = (bool)respData["isOnline_" + i];
-                                if (info.isOnline) info.regionHandle = Convert.ToUInt64(respData["regionHandle_" + i]);
+                                if (info.isOnline)
+                                {
+                                    // TODO remove this after the next protocol update (say, r7800?)
+                                    info.regionHandle = Convert.ToUInt64(respData["regionHandle_" + i]);
+
+                                    // accept missing id
+                                    if(respData.ContainsKey("regionID_" + i))
+                                        UUID.TryParse((string)respData["regionID_" + i], out info.regionID);
+                                }
 
                                 result.Add(uuid, info);
                             }
-- 
cgit v1.1