OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Sync viewer on make root

melanie
Melanie Thielker 2017-01-06 01:27:30 +00:00
parent a61a41ad92
commit 9b93068054
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/Framework/Scenes/GodController.cs
View File

@ -141,7 +141,7 @@ namespace OpenSim.Region.Framework.Scenes
if (!shoudBeGod) if (!shoudBeGod)
godLevel = 0; godLevel = 0;
if (m_viewerUiIsGod != shoudBeGod) if (m_viewerUiIsGod != shoudBeGod && (!m_scenePresence.IsChildAgent))
{ {
m_scenePresence.ControllingClient.SendAdminResponse(UUID.Zero, (uint)godLevel); m_scenePresence.ControllingClient.SendAdminResponse(UUID.Zero, (uint)godLevel);
m_viewerUiIsGod = shoudBeGod; m_viewerUiIsGod = shoudBeGod;

1
OpenSim/Region/Framework/Scenes/ScenePresence.cs
View File

@ -1290,6 +1290,7 @@ namespace OpenSim.Region.Framework.Scenes
} }
IsChildAgent = false; IsChildAgent = false;
GodController.SyncViewerState();
} }
m_log.DebugFormat("[MakeRootAgent] out lock: {0}ms", Util.EnvironmentTickCountSubtract(ts)); m_log.DebugFormat("[MakeRootAgent] out lock: {0}ms", Util.EnvironmentTickCountSubtract(ts));