aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Communications/OGS1
diff options
context:
space:
mode:
authorHomer Horwitz2008-11-24 22:07:45 +0000
committerHomer Horwitz2008-11-24 22:07:45 +0000
commit62c263d32b1cfb2dfc8e3681ea93f2dd33c077ca (patch)
tree9d67fa434c0025ee08248c8296282c1772ad5ec0 /OpenSim/Region/Communications/OGS1
parent- Evaluate config only once (diff)
downloadopensim-SC_OLD-62c263d32b1cfb2dfc8e3681ea93f2dd33c077ca.zip
opensim-SC_OLD-62c263d32b1cfb2dfc8e3681ea93f2dd33c077ca.tar.gz
opensim-SC_OLD-62c263d32b1cfb2dfc8e3681ea93f2dd33c077ca.tar.bz2
opensim-SC_OLD-62c263d32b1cfb2dfc8e3681ea93f2dd33c077ca.tar.xz
WIP: Adding a few things to PresenceModule. Not quite finished yet.
Diffstat (limited to 'OpenSim/Region/Communications/OGS1')
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1UserServices.cs10
1 files changed, 9 insertions, 1 deletions
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
770 { 770 {
771 FriendRegionInfo info = new FriendRegionInfo(); 771 FriendRegionInfo info = new FriendRegionInfo();
772 info.isOnline = (bool)respData["isOnline_" + i]; 772 info.isOnline = (bool)respData["isOnline_" + i];
773 if (info.isOnline) info.regionHandle = Convert.ToUInt64(respData["regionHandle_" + i]); 773 if (info.isOnline)
774 {
775 // TODO remove this after the next protocol update (say, r7800?)
776 info.regionHandle = Convert.ToUInt64(respData["regionHandle_" + i]);
777
778 // accept missing id
779 if(respData.ContainsKey("regionID_" + i))
780 UUID.TryParse((string)respData["regionID_" + i], out info.regionID);
781 }
774 782
775 result.Add(uuid, info); 783 result.Add(uuid, info);
776 } 784 }