aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorTeravus Ovares2008-08-28 08:25:47 +0000
committerTeravus Ovares2008-08-28 08:25:47 +0000
commit47127abfb6ddceb1140753281506f2091c9b2a6c (patch)
treee52d3560d77deb77330011b47b5c14c0c9b96c83 /OpenSim
parent* OGP update, deserialize the parameter array properly in rez_avatar (diff)
downloadopensim-SC_OLD-47127abfb6ddceb1140753281506f2091c9b2a6c.zip
opensim-SC_OLD-47127abfb6ddceb1140753281506f2091c9b2a6c.tar.gz
opensim-SC_OLD-47127abfb6ddceb1140753281506f2091c9b2a6c.tar.bz2
opensim-SC_OLD-47127abfb6ddceb1140753281506f2091c9b2a6c.tar.xz
* Added hack so that if the default OpenSimulator ParentEstateId(100) is being sent through rez_avatar, it'll be swapped out with 1. This ensures that when the map recognizes the parent estate id parameter on the linden grid, it'll work as expected. This also has the effect of making it impossible to send a Parent Estate ID with 100 over OGP from OpenSimulator (Sorry Owner of estate 100).
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs b/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs
index 7bbbc22..926e584 100644
--- a/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs
+++ b/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs
@@ -669,7 +669,7 @@ namespace OpenSim.Region.Environment.Modules.InterGrid
669 669
670 LLSDMap SrcData = new LLSDMap(); 670 LLSDMap SrcData = new LLSDMap();
671 SrcData["estate_id"] = LLSD.FromInteger(reg.RegionInfo.EstateSettings.EstateID); 671 SrcData["estate_id"] = LLSD.FromInteger(reg.RegionInfo.EstateSettings.EstateID);
672 SrcData["parent_estate_id"] = LLSD.FromInteger(reg.RegionInfo.EstateSettings.ParentEstateID); 672 SrcData["parent_estate_id"] = LLSD.FromInteger((reg.RegionInfo.EstateSettings.ParentEstateID == 100 ? 1 : reg.RegionInfo.EstateSettings.ParentEstateID));
673 SrcData["region_id"] = LLSD.FromUUID(reg.RegionInfo.originRegionID); 673 SrcData["region_id"] = LLSD.FromUUID(reg.RegionInfo.originRegionID);
674 SrcData["visible_to_parent"] = LLSD.FromBoolean(userState.visible_to_parent); 674 SrcData["visible_to_parent"] = LLSD.FromBoolean(userState.visible_to_parent);
675 Parameter.Add((LLSD)SrcData); 675 Parameter.Add((LLSD)SrcData);