aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorUbitUmarov2017-01-06 03:45:47 +0000
committerUbitUmarov2017-01-06 03:45:47 +0000
commite5a3d85bc7618a023222a8120984999158a8bd43 (patch)
tree69a5d94ca57f3125437c1ee6667f6a679b2eabef /OpenSim/Region/Framework
parentfix typo (diff)
downloadopensim-SC-e5a3d85bc7618a023222a8120984999158a8bd43.zip
opensim-SC-e5a3d85bc7618a023222a8120984999158a8bd43.tar.gz
opensim-SC-e5a3d85bc7618a023222a8120984999158a8bd43.tar.bz2
opensim-SC-e5a3d85bc7618a023222a8120984999158a8bd43.tar.xz
fix/simplify validation of god_data update field
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/GodController.cs5
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
198 198
199 public void SetState(OSD state) 199 public void SetState(OSD state)
200 { 200 {
201 if(state == null)
202 return;
203
201 OSDMap s = (OSDMap)state; 204 OSDMap s = (OSDMap)state;
202 205
203 if (s.ContainsKey("ViewerUiIsGod")) 206 if (s.ContainsKey("ViewerUiIsGod"))
204 m_viewerUiIsGod = s["ViewerUiIsGod"].AsBoolean(); 207 m_viewerUiIsGod = s["ViewerUiIsGod"].AsBoolean();
205
206 SyncViewerState();
207 } 208 }
208 209
209 public int UserLevel 210 public int UserLevel