aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.cs
diff options
context:
space:
mode:
authorUbitUmarov2017-05-04 12:57:11 +0100
committerUbitUmarov2017-05-04 12:57:11 +0100
commit5f5b7e56dbff9acbd57506db852160761613556e (patch)
treea2de12fc323878ad393d952fa2ab7cc3a5d55a9c /OpenSim/Region/Framework/Scenes/Scene.cs
parentviewer can't tell if a taskitem is group owned if we don't tell him; (diff)
parent the new options i add where actually bad idea, they would make the (diff)
downloadopensim-SC-5f5b7e56dbff9acbd57506db852160761613556e.zip
opensim-SC-5f5b7e56dbff9acbd57506db852160761613556e.tar.gz
opensim-SC-5f5b7e56dbff9acbd57506db852160761613556e.tar.bz2
opensim-SC-5f5b7e56dbff9acbd57506db852160761613556e.tar.xz
merge fix
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
-rwxr-xr-xOpenSim/Region/Framework/Scenes/Scene.cs6
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 715ae5c..e709d6c 100755
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -978,6 +978,7 @@ namespace OpenSim.Region.Framework.Scenes
978 m_maxDrawDistance = startupConfig.GetFloat("MaxDrawDistance", m_maxDrawDistance); 978 m_maxDrawDistance = startupConfig.GetFloat("MaxDrawDistance", m_maxDrawDistance);
979 m_maxRegionViewDistance = startupConfig.GetFloat("MaxRegionsViewDistance", m_maxRegionViewDistance); 979 m_maxRegionViewDistance = startupConfig.GetFloat("MaxRegionsViewDistance", m_maxRegionViewDistance);
980 980
981 // old versions compatibility
981 LegacySitOffsets = startupConfig.GetBoolean("LegacySitOffsets", LegacySitOffsets); 982 LegacySitOffsets = startupConfig.GetBoolean("LegacySitOffsets", LegacySitOffsets);
982 983
983 if (m_defaultDrawDistance > m_maxDrawDistance) 984 if (m_defaultDrawDistance > m_maxDrawDistance)
@@ -2390,8 +2391,9 @@ namespace OpenSim.Region.Framework.Scenes
2390 EventManager.TriggerOnSceneObjectLoaded(group); 2391 EventManager.TriggerOnSceneObjectLoaded(group);
2391 SceneObjectPart rootPart = group.GetPart(group.UUID); 2392 SceneObjectPart rootPart = group.GetPart(group.UUID);
2392 rootPart.Flags &= ~PrimFlags.Scripted; 2393 rootPart.Flags &= ~PrimFlags.Scripted;
2393 group.AggregateDeepPerms(); 2394
2394 rootPart.TrimPermissions(); 2395 rootPart.TrimPermissions();
2396 group.InvalidateDeepEffectivePerms();
2395 2397
2396 // Don't do this here - it will get done later on when sculpt data is loaded. 2398 // Don't do this here - it will get done later on when sculpt data is loaded.
2397 // group.CheckSculptAndLoad(); 2399 // group.CheckSculptAndLoad();
@@ -2662,7 +2664,7 @@ namespace OpenSim.Region.Framework.Scenes
2662 if (UserManagementModule != null) 2664 if (UserManagementModule != null)
2663 sceneObject.RootPart.CreatorIdentification = UserManagementModule.GetUserUUI(ownerID); 2665 sceneObject.RootPart.CreatorIdentification = UserManagementModule.GetUserUUI(ownerID);
2664 2666
2665 sceneObject.AggregateDeepPerms(); 2667 sceneObject.InvalidateDeepEffectivePerms();;
2666 sceneObject.ScheduleGroupForFullUpdate(); 2668 sceneObject.ScheduleGroupForFullUpdate();
2667 2669
2668 return sceneObject; 2670 return sceneObject;