* 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).
parent
88b3df9d52
commit
47127abfb6
|
@ -669,7 +669,7 @@ namespace OpenSim.Region.Environment.Modules.InterGrid
|
||||||
|
|
||||||
LLSDMap SrcData = new LLSDMap();
|
LLSDMap SrcData = new LLSDMap();
|
||||||
SrcData["estate_id"] = LLSD.FromInteger(reg.RegionInfo.EstateSettings.EstateID);
|
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["region_id"] = LLSD.FromUUID(reg.RegionInfo.originRegionID);
|
||||||
SrcData["visible_to_parent"] = LLSD.FromBoolean(userState.visible_to_parent);
|
SrcData["visible_to_parent"] = LLSD.FromBoolean(userState.visible_to_parent);
|
||||||
Parameter.Add((LLSD)SrcData);
|
Parameter.Add((LLSD)SrcData);
|
||||||
|
|
Loading…
Reference in New Issue