From e5a3d85bc7618a023222a8120984999158a8bd43 Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Fri, 6 Jan 2017 03:45:47 +0000
Subject: fix/simplify validation of god_data update field

---
 OpenSim/Region/Framework/Scenes/GodController.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region')

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
-- 
cgit v1.1