1 files changed, 3 insertions, 2 deletions

diff --git a/OpenSim/Region/Framework/Scenes/GodController.cs b/OpenSim/Region/Framework/Scenes/GodController.cs
index 7672062..f51e8c9 100644
--- a/OpenSim/Region/Framework/Scenes/GodController.cs
+++ b/OpenSim/Region/Framework/Scenes/GodController.cs
@@ -198,12 +198,13 @@ namespace OpenSim.Region.Framework.Scenes
 
         public void SetState(OSD state)
         {
+            if(state == null)
+                return;
+
             OSDMap s = (OSDMap)state;
 
             if (s.ContainsKey("ViewerUiIsGod"))
                 m_viewerUiIsGod = s["ViewerUiIsGod"].AsBoolean();
-
-            SyncViewerState();
         }
 
         public int UserLevel