aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorMelanie2012-10-28 18:34:57 +0100
committerMelanie2012-10-28 18:34:57 +0100
commit1a34f42426b5819f97079c138c596182bf683416 (patch)
tree4dacec83608b52399ad47484c721d93062a77960 /OpenSim/Region
parentDeep copy the collection of at_target objects so it can't be modified while (diff)
downloadopensim-SC_OLD-1a34f42426b5819f97079c138c596182bf683416.zip
opensim-SC_OLD-1a34f42426b5819f97079c138c596182bf683416.tar.gz
opensim-SC_OLD-1a34f42426b5819f97079c138c596182bf683416.tar.bz2
opensim-SC_OLD-1a34f42426b5819f97079c138c596182bf683416.tar.xz
Add a property to determine if a link set is stored in the database. Also, fix
a bug where "Force object permissive" god action would fail to reset child prim permissions.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs13
1 files changed, 13 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index b12d0e0..ee61de6 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -307,6 +307,11 @@ namespace OpenSim.Region.Framework.Scenes
307 307
308 private bool m_isBackedUp; 308 private bool m_isBackedUp;
309 309
310 public bool IsBackedUp
311 {
312 get { return m_isBackedUp; }
313 }
314
310 protected MapAndArray<UUID, SceneObjectPart> m_parts = new MapAndArray<UUID, SceneObjectPart>(); 315 protected MapAndArray<UUID, SceneObjectPart> m_parts = new MapAndArray<UUID, SceneObjectPart>();
311 316
312 protected ulong m_regionHandle; 317 protected ulong m_regionHandle;
@@ -3431,6 +3436,14 @@ namespace OpenSim.Region.Framework.Scenes
3431 3436
3432 bool god = Scene.Permissions.IsGod(AgentID); 3437 bool god = Scene.Permissions.IsGod(AgentID);
3433 3438
3439 if (field == 1 && god)
3440 {
3441 ForEachPart(part =>
3442 {
3443 part.BaseMask = RootPart.BaseMask;
3444 });
3445 }
3446
3434 AdjustChildPrimPermissions(); 3447 AdjustChildPrimPermissions();
3435 3448
3436 if (field == 1 && god) // Base mask was set. Update all child part inventories 3449 if (field == 1 && god) // Base mask was set. Update all child part inventories