aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorUbitUmarov2017-01-05 21:21:15 +0000
committerUbitUmarov2017-01-05 21:21:15 +0000
commit1fb01a009925f6c5d55f9f485a6d151b3b981f40 (patch)
treee4d049b30f06df07d1ddc5b72bb4e8499866bea2 /OpenSim/Framework
parentremove code i started but didn't finish (diff)
downloadopensim-SC_OLD-1fb01a009925f6c5d55f9f485a6d151b3b981f40.zip
opensim-SC_OLD-1fb01a009925f6c5d55f9f485a6d151b3b981f40.tar.gz
opensim-SC_OLD-1fb01a009925f6c5d55f9f485a6d151b3b981f40.tar.bz2
opensim-SC_OLD-1fb01a009925f6c5d55f9f485a6d151b3b981f40.tar.xz
add config option automatic_gods. With this option true, users that can be Gods will have that level automaticly without the need request on viewer; Propagate current god level to nearby regions (with local checks)
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/ChildAgentDataUpdate.cs5
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Framework/ChildAgentDataUpdate.cs b/OpenSim/Framework/ChildAgentDataUpdate.cs
index 0e5eaf2..03ead01 100644
--- a/OpenSim/Framework/ChildAgentDataUpdate.cs
+++ b/OpenSim/Framework/ChildAgentDataUpdate.cs
@@ -89,6 +89,7 @@ namespace OpenSim.Framework
89 public Vector3 AtAxis; 89 public Vector3 AtAxis;
90 public Vector3 LeftAxis; 90 public Vector3 LeftAxis;
91 public Vector3 UpAxis; 91 public Vector3 UpAxis;
92 public int GodLevel;
92 public bool ChangedGrid; 93 public bool ChangedGrid;
93 94
94 // This probably shouldn't be here 95 // This probably shouldn't be here
@@ -116,6 +117,7 @@ namespace OpenSim.Framework
116 117
117 args["far"] = OSD.FromReal(Far); 118 args["far"] = OSD.FromReal(Far);
118 args["changed_grid"] = OSD.FromBoolean(ChangedGrid); 119 args["changed_grid"] = OSD.FromBoolean(ChangedGrid);
120 args["god_level"] = OSD.FromString(GodLevel.ToString());
119 121
120 if ((Throttles != null) && (Throttles.Length > 0)) 122 if ((Throttles != null) && (Throttles.Length > 0))
121 args["throttles"] = OSD.FromBinary(Throttles); 123 args["throttles"] = OSD.FromBinary(Throttles);
@@ -174,6 +176,9 @@ namespace OpenSim.Framework
174 if (args["changed_grid"] != null) 176 if (args["changed_grid"] != null)
175 ChangedGrid = args["changed_grid"].AsBoolean(); 177 ChangedGrid = args["changed_grid"].AsBoolean();
176 178
179 if (args["god_level"] != null)
180 Int32.TryParse(args["god_level"].AsString(), out GodLevel);
181
177 if (args["far"] != null) 182 if (args["far"] != null)
178 Far = (float)(args["far"].AsReal()); 183 Far = (float)(args["far"].AsReal());
179 184