From a61a41ad921643813d00014570edd3d357abc333 Mon Sep 17 00:00:00 2001
From: Melanie Thielker <melanie@t-data.com>
Date: Fri, 6 Jan 2017 01:22:36 +0000
Subject: [PATCH] Send GodLevel to viewers on login

---
 OpenSim/Region/Framework/Scenes/GodController.cs | 2 +-
 OpenSim/Region/Framework/Scenes/ScenePresence.cs | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Region/Framework/Scenes/GodController.cs b/OpenSim/Region/Framework/Scenes/GodController.cs
index 5763e0345e..d45f5603f0 100644
--- a/OpenSim/Region/Framework/Scenes/GodController.cs
+++ b/OpenSim/Region/Framework/Scenes/GodController.cs
@@ -131,7 +131,7 @@ namespace OpenSim.Region.Framework.Scenes
             return canBeGod;
         }
 
-        protected void SyncViewerState()
+        public void SyncViewerState()
         {
             bool canBeGod = CanBeGod();
 
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 339f1b1c3b..38e46e7f06 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2015,6 +2015,8 @@ namespace OpenSim.Region.Framework.Scenes
                     if (!WaitForUpdateAgent(client))
                         // The sending region never sent the UpdateAgent data, we have to refuse
                         return;
+
+                    GodController.SyncViewerState();
                 }
 
                 m_log.DebugFormat("[CompleteMovement] WaitForUpdateAgent: {0}ms", Util.EnvironmentTickCountSubtract(ts));