aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authorMelanie Thielker2017-01-06 01:22:36 +0000
committerMelanie Thielker2017-01-06 01:22:36 +0000
commita61a41ad921643813d00014570edd3d357abc333 (patch)
tree00d5523140cfa4092045775e9cf7f37df64255cb /OpenSim/Region/Framework/Scenes
parentUserLevel must have a trusted source (diff)
downloadopensim-SC-a61a41ad921643813d00014570edd3d357abc333.zip
opensim-SC-a61a41ad921643813d00014570edd3d357abc333.tar.gz
opensim-SC-a61a41ad921643813d00014570edd3d357abc333.tar.bz2
opensim-SC-a61a41ad921643813d00014570edd3d357abc333.tar.xz
Send GodLevel to viewers on login
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/GodController.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs2
2 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/GodController.cs b/OpenSim/Region/Framework/Scenes/GodController.cs
index 5763e03..d45f560 100644
--- a/OpenSim/Region/Framework/Scenes/GodController.cs
+++ b/OpenSim/Region/Framework/Scenes/GodController.cs
@@ -131,7 +131,7 @@ namespace OpenSim.Region.Framework.Scenes
131 return canBeGod; 131 return canBeGod;
132 } 132 }
133 133
134 protected void SyncViewerState() 134 public void SyncViewerState()
135 { 135 {
136 bool canBeGod = CanBeGod(); 136 bool canBeGod = CanBeGod();
137 137
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 339f1b1..38e46e7 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2015,6 +2015,8 @@ namespace OpenSim.Region.Framework.Scenes
2015 if (!WaitForUpdateAgent(client)) 2015 if (!WaitForUpdateAgent(client))
2016 // The sending region never sent the UpdateAgent data, we have to refuse 2016 // The sending region never sent the UpdateAgent data, we have to refuse
2017 return; 2017 return;
2018
2019 GodController.SyncViewerState();
2018 } 2020 }
2019 2021
2020 m_log.DebugFormat("[CompleteMovement] WaitForUpdateAgent: {0}ms", Util.EnvironmentTickCountSubtract(ts)); 2022 m_log.DebugFormat("[CompleteMovement] WaitForUpdateAgent: {0}ms", Util.EnvironmentTickCountSubtract(ts));