aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/GodController.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs1
2 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/GodController.cs b/OpenSim/Region/Framework/Scenes/GodController.cs
index d45f560..abdbe51 100644
--- a/OpenSim/Region/Framework/Scenes/GodController.cs
+++ b/OpenSim/Region/Framework/Scenes/GodController.cs
@@ -141,7 +141,7 @@ namespace OpenSim.Region.Framework.Scenes
141 if (!shoudBeGod) 141 if (!shoudBeGod)
142 godLevel = 0; 142 godLevel = 0;
143 143
144 if (m_viewerUiIsGod != shoudBeGod) 144 if (m_viewerUiIsGod != shoudBeGod && (!m_scenePresence.IsChildAgent))
145 { 145 {
146 m_scenePresence.ControllingClient.SendAdminResponse(UUID.Zero, (uint)godLevel); 146 m_scenePresence.ControllingClient.SendAdminResponse(UUID.Zero, (uint)godLevel);
147 m_viewerUiIsGod = shoudBeGod; 147 m_viewerUiIsGod = shoudBeGod;
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 38e46e7..28b2f52 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1290,6 +1290,7 @@ namespace OpenSim.Region.Framework.Scenes
1290 } 1290 }
1291 1291
1292 IsChildAgent = false; 1292 IsChildAgent = false;
1293 GodController.SyncViewerState();
1293 } 1294 }
1294 1295
1295 m_log.DebugFormat("[MakeRootAgent] out lock: {0}ms", Util.EnvironmentTickCountSubtract(ts)); 1296 m_log.DebugFormat("[MakeRootAgent] out lock: {0}ms", Util.EnvironmentTickCountSubtract(ts));