update libomv
parent
3c8b4423b1
commit
362025be38
|
@ -868,7 +868,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
||||||
flags |= RegionFlags.DenyAgeUnverified;
|
flags |= RegionFlags.DenyAgeUnverified;
|
||||||
|
|
||||||
if(Scene.RegionInfo.EstateSettings.AllowEnvironmentOverride)
|
if(Scene.RegionInfo.EstateSettings.AllowEnvironmentOverride)
|
||||||
flags |= RegionFlags.AllowEnviromentOverride;
|
flags |= RegionFlags.AllowEnvironmentOverride;
|
||||||
return (uint)flags;
|
return (uint)flags;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -6564,7 +6564,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
||||||
|
|
||||||
LLSDxmlEncode.AddEndMapAndArray(sb);
|
LLSDxmlEncode.AddEndMapAndArray(sb);
|
||||||
|
|
||||||
bool allowenvovr = (regionFlags & (uint)RegionFlags.AllowEnviromentOverride) != 0;
|
bool allowenvovr = (regionFlags & (uint)RegionFlags.AllowEnvironmentOverride) != 0;
|
||||||
LLSDxmlEncode.AddArrayAndMap("ParcelEnvironmentBlock", sb);
|
LLSDxmlEncode.AddArrayAndMap("ParcelEnvironmentBlock", sb);
|
||||||
LLSDxmlEncode.AddElem("ParcelEnvironmentVersion", allowenvovr ? -1: landData.EnvironmentVersion, sb);
|
LLSDxmlEncode.AddElem("ParcelEnvironmentVersion", allowenvovr ? -1: landData.EnvironmentVersion, sb);
|
||||||
LLSDxmlEncode.AddElem("RegionAllowEnvironmentOverride", allowenvovr, sb);
|
LLSDxmlEncode.AddElem("RegionAllowEnvironmentOverride", allowenvovr, sb);
|
||||||
|
|
|
@ -181,7 +181,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
|
||||||
flags |= RegionFlags.ResetHomeOnTeleport;
|
flags |= RegionFlags.ResetHomeOnTeleport;
|
||||||
|
|
||||||
if (Scene.RegionInfo.EstateSettings.AllowEnvironmentOverride)
|
if (Scene.RegionInfo.EstateSettings.AllowEnvironmentOverride)
|
||||||
flags |= RegionFlags.AllowEnviromentOverride;
|
flags |= RegionFlags.AllowEnvironmentOverride;
|
||||||
|
|
||||||
// TODO: SkipUpdateInterestList
|
// TODO: SkipUpdateInterestList
|
||||||
|
|
||||||
|
@ -1707,7 +1707,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
|
||||||
flags |= RegionFlags.DenyAgeUnverified;
|
flags |= RegionFlags.DenyAgeUnverified;
|
||||||
|
|
||||||
if (Scene.RegionInfo.EstateSettings.AllowEnvironmentOverride)
|
if (Scene.RegionInfo.EstateSettings.AllowEnvironmentOverride)
|
||||||
flags |= RegionFlags.AllowEnviromentOverride;
|
flags |= RegionFlags.AllowEnvironmentOverride;
|
||||||
|
|
||||||
return (uint)flags;
|
return (uint)flags;
|
||||||
}
|
}
|
||||||
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue