From 47127abfb6ddceb1140753281506f2091c9b2a6c Mon Sep 17 00:00:00 2001 From: Teravus Ovares Date: Thu, 28 Aug 2008 08:25:47 +0000 Subject: [PATCH] * 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). --- .../Environment/Modules/InterGrid/OpenGridProtocolModule.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs b/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs index 7bbbc221df..926e584441 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 LLSDMap SrcData = new LLSDMap(); SrcData["estate_id"] = LLSD.FromInteger(reg.RegionInfo.EstateSettings.EstateID); - SrcData["parent_estate_id"] = LLSD.FromInteger(reg.RegionInfo.EstateSettings.ParentEstateID); + SrcData["parent_estate_id"] = LLSD.FromInteger((reg.RegionInfo.EstateSettings.ParentEstateID == 100 ? 1 : reg.RegionInfo.EstateSettings.ParentEstateID)); SrcData["region_id"] = LLSD.FromUUID(reg.RegionInfo.originRegionID); SrcData["visible_to_parent"] = LLSD.FromBoolean(userState.visible_to_parent); Parameter.Add((LLSD)SrcData);