diff options
author | UbitUmarov | 2017-06-07 18:15:15 +0100 |
---|---|---|
committer | UbitUmarov | 2017-06-07 18:15:15 +0100 |
commit | eca89c6e61126da9bf526e97cf06ee738f0460be (patch) | |
tree | f7f06257b09eda0d4e93854bbb7b0a142356f2a4 /OpenSim/Region/OptionalModules/World | |
parent | remove nonsense SendPeriodicAppearanceUpdates. if we need such a thing, then ... (diff) | |
download | opensim-SC_OLD-eca89c6e61126da9bf526e97cf06ee738f0460be.zip opensim-SC_OLD-eca89c6e61126da9bf526e97cf06ee738f0460be.tar.gz opensim-SC_OLD-eca89c6e61126da9bf526e97cf06ee738f0460be.tar.bz2 opensim-SC_OLD-eca89c6e61126da9bf526e97cf06ee738f0460be.tar.xz |
remove some more dead scene options
Diffstat (limited to 'OpenSim/Region/OptionalModules/World')
-rw-r--r-- | OpenSim/Region/OptionalModules/World/SceneCommands/SceneCommandsModule.cs | 78 |
1 files changed, 0 insertions, 78 deletions
diff --git a/OpenSim/Region/OptionalModules/World/SceneCommands/SceneCommandsModule.cs b/OpenSim/Region/OptionalModules/World/SceneCommands/SceneCommandsModule.cs index 45edbda..7e3bd7f 100644 --- a/OpenSim/Region/OptionalModules/World/SceneCommands/SceneCommandsModule.cs +++ b/OpenSim/Region/OptionalModules/World/SceneCommands/SceneCommandsModule.cs | |||
@@ -96,17 +96,11 @@ namespace OpenSim.Region.OptionalModules.Avatar.Attachments | |||
96 | "List current scene options.", | 96 | "List current scene options.", |
97 | "active - if false then main scene update and maintenance loops are suspended.\n" | 97 | "active - if false then main scene update and maintenance loops are suspended.\n" |
98 | + "animations - if true then extra animations debug information is logged.\n" | 98 | + "animations - if true then extra animations debug information is logged.\n" |
99 | + "client-pos-upd - the tolerance before clients are updated with new rotation information for an avatar.\n" | ||
100 | + "client-rot-upd - the tolerance before clients are updated with new rotation information for an avatar.\n" | ||
101 | + "client-vel-upd - the tolerance before clients are updated with new velocity information for an avatar.\n" | ||
102 | + "root-upd-per - if greater than 1, terse updates are only sent to root agents other than the originator on every n updates.\n" | ||
103 | + "child-upd-per - if greater than 1, terse updates are only sent to child agents on every n updates.\n" | ||
104 | + "collisions - if false then collisions with other objects are turned off.\n" | 99 | + "collisions - if false then collisions with other objects are turned off.\n" |
105 | + "pbackup - if false then periodic scene backup is turned off.\n" | 100 | + "pbackup - if false then periodic scene backup is turned off.\n" |
106 | + "physics - if false then all physics objects are non-physical.\n" | 101 | + "physics - if false then all physics objects are non-physical.\n" |
107 | + "scripting - if false then no scripting operations happen.\n" | 102 | + "scripting - if false then no scripting operations happen.\n" |
108 | + "teleport - if true then some extra teleport debug information is logged.\n" | 103 | + "teleport - if true then some extra teleport debug information is logged.\n" |
109 | + "update-on-timer - If true then the scene is updated via a timer. If false then a thread with sleep is used.\n" | ||
110 | + "updates - if true then any frame which exceeds double the maximum desired frame time is logged.", | 104 | + "updates - if true then any frame which exceeds double the maximum desired frame time is logged.", |
111 | HandleDebugSceneGetCommand); | 105 | HandleDebugSceneGetCommand); |
112 | 106 | ||
@@ -116,17 +110,11 @@ namespace OpenSim.Region.OptionalModules.Avatar.Attachments | |||
116 | "Turn on scene debugging options.", | 110 | "Turn on scene debugging options.", |
117 | "active - if false then main scene update and maintenance loops are suspended.\n" | 111 | "active - if false then main scene update and maintenance loops are suspended.\n" |
118 | + "animations - if true then extra animations debug information is logged.\n" | 112 | + "animations - if true then extra animations debug information is logged.\n" |
119 | + "client-pos-upd - the tolerance before clients are updated with new rotation information for an avatar.\n" | ||
120 | + "client-rot-upd - the tolerance before clients are updated with new rotation information for an avatar.\n" | ||
121 | + "client-vel-upd - the tolerance before clients are updated with new velocity information for an avatar.\n" | ||
122 | + "root-upd-per - if greater than 1, terse updates are only sent to root agents other than the originator on every n updates.\n" | ||
123 | + "child-upd-per - if greater than 1, terse updates are only sent to child agents on every n updates.\n" | ||
124 | + "collisions - if false then collisions with other objects are turned off.\n" | 113 | + "collisions - if false then collisions with other objects are turned off.\n" |
125 | + "pbackup - if false then periodic scene backup is turned off.\n" | 114 | + "pbackup - if false then periodic scene backup is turned off.\n" |
126 | + "physics - if false then all physics objects are non-physical.\n" | 115 | + "physics - if false then all physics objects are non-physical.\n" |
127 | + "scripting - if false then no scripting operations happen.\n" | 116 | + "scripting - if false then no scripting operations happen.\n" |
128 | + "teleport - if true then some extra teleport debug information is logged.\n" | 117 | + "teleport - if true then some extra teleport debug information is logged.\n" |
129 | + "update-on-timer - If true then the scene is updated via a timer. If false then a thread with sleep is used.\n" | ||
130 | + "updates - if true then any frame which exceeds double the maximum desired frame time is logged.", | 118 | + "updates - if true then any frame which exceeds double the maximum desired frame time is logged.", |
131 | HandleDebugSceneSetCommand); | 119 | HandleDebugSceneSetCommand); |
132 | } | 120 | } |
@@ -151,16 +139,10 @@ namespace OpenSim.Region.OptionalModules.Avatar.Attachments | |||
151 | ConsoleDisplayList cdl = new ConsoleDisplayList(); | 139 | ConsoleDisplayList cdl = new ConsoleDisplayList(); |
152 | cdl.AddRow("active", m_scene.Active); | 140 | cdl.AddRow("active", m_scene.Active); |
153 | cdl.AddRow("animations", m_scene.DebugAnimations); | 141 | cdl.AddRow("animations", m_scene.DebugAnimations); |
154 | cdl.AddRow("client-pos-upd", m_scene.RootPositionUpdateTolerance); | ||
155 | cdl.AddRow("client-rot-upd", m_scene.RootRotationUpdateTolerance); | ||
156 | cdl.AddRow("client-vel-upd", m_scene.RootVelocityUpdateTolerance); | ||
157 | cdl.AddRow("root-upd-per", m_scene.RootTerseUpdatePeriod); | ||
158 | cdl.AddRow("child-upd-per", m_scene.ChildTerseUpdatePeriod); | ||
159 | cdl.AddRow("pbackup", m_scene.PeriodicBackup); | 142 | cdl.AddRow("pbackup", m_scene.PeriodicBackup); |
160 | cdl.AddRow("physics", m_scene.PhysicsEnabled); | 143 | cdl.AddRow("physics", m_scene.PhysicsEnabled); |
161 | cdl.AddRow("scripting", m_scene.ScriptsEnabled); | 144 | cdl.AddRow("scripting", m_scene.ScriptsEnabled); |
162 | cdl.AddRow("teleport", m_scene.DebugTeleporting); | 145 | cdl.AddRow("teleport", m_scene.DebugTeleporting); |
163 | // cdl.AddRow("update-on-timer", m_scene.UpdateOnTimer); | ||
164 | cdl.AddRow("updates", m_scene.DebugUpdates); | 146 | cdl.AddRow("updates", m_scene.DebugUpdates); |
165 | 147 | ||
166 | MainConsole.Instance.OutputFormat("Scene {0} options:", m_scene.Name); | 148 | MainConsole.Instance.OutputFormat("Scene {0} options:", m_scene.Name); |
@@ -204,51 +186,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.Attachments | |||
204 | m_scene.DebugAnimations = active; | 186 | m_scene.DebugAnimations = active; |
205 | } | 187 | } |
206 | 188 | ||
207 | if (options.ContainsKey("client-pos-upd")) | ||
208 | { | ||
209 | float newValue; | ||
210 | |||
211 | // FIXME: This can only come from the console at the moment but might not always be true. | ||
212 | if (ConsoleUtil.TryParseConsoleFloat(MainConsole.Instance, options["client-pos-upd"], out newValue)) | ||
213 | m_scene.RootPositionUpdateTolerance = newValue; | ||
214 | } | ||
215 | |||
216 | if (options.ContainsKey("client-rot-upd")) | ||
217 | { | ||
218 | float newValue; | ||
219 | |||
220 | // FIXME: This can only come from the console at the moment but might not always be true. | ||
221 | if (ConsoleUtil.TryParseConsoleFloat(MainConsole.Instance, options["client-rot-upd"], out newValue)) | ||
222 | m_scene.RootRotationUpdateTolerance = newValue; | ||
223 | } | ||
224 | |||
225 | if (options.ContainsKey("client-vel-upd")) | ||
226 | { | ||
227 | float newValue; | ||
228 | |||
229 | // FIXME: This can only come from the console at the moment but might not always be true. | ||
230 | if (ConsoleUtil.TryParseConsoleFloat(MainConsole.Instance, options["client-vel-upd"], out newValue)) | ||
231 | m_scene.RootVelocityUpdateTolerance = newValue; | ||
232 | } | ||
233 | |||
234 | if (options.ContainsKey("root-upd-per")) | ||
235 | { | ||
236 | int newValue; | ||
237 | |||
238 | // FIXME: This can only come from the console at the moment but might not always be true. | ||
239 | if (ConsoleUtil.TryParseConsoleNaturalInt(MainConsole.Instance, options["root-upd-per"], out newValue)) | ||
240 | m_scene.RootTerseUpdatePeriod = newValue; | ||
241 | } | ||
242 | |||
243 | if (options.ContainsKey("child-upd-per")) | ||
244 | { | ||
245 | int newValue; | ||
246 | |||
247 | // FIXME: This can only come from the console at the moment but might not always be true. | ||
248 | if (ConsoleUtil.TryParseConsoleNaturalInt(MainConsole.Instance, options["child-upd-per"], out newValue)) | ||
249 | m_scene.ChildTerseUpdatePeriod = newValue; | ||
250 | } | ||
251 | |||
252 | if (options.ContainsKey("pbackup")) | 189 | if (options.ContainsKey("pbackup")) |
253 | { | 190 | { |
254 | bool active; | 191 | bool active; |
@@ -284,21 +221,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.Attachments | |||
284 | m_scene.DebugTeleporting = enableTeleportDebugging; | 221 | m_scene.DebugTeleporting = enableTeleportDebugging; |
285 | } | 222 | } |
286 | 223 | ||
287 | if (options.ContainsKey("update-on-timer")) | ||
288 | { | ||
289 | bool enableUpdateOnTimer; | ||
290 | if (bool.TryParse(options["update-on-timer"], out enableUpdateOnTimer)) | ||
291 | { | ||
292 | // m_scene.UpdateOnTimer = enableUpdateOnTimer; | ||
293 | m_scene.Active = false; | ||
294 | |||
295 | while (m_scene.IsRunning) | ||
296 | Thread.Sleep(20); | ||
297 | |||
298 | m_scene.Active = true; | ||
299 | } | ||
300 | } | ||
301 | |||
302 | if (options.ContainsKey("updates")) | 224 | if (options.ContainsKey("updates")) |
303 | { | 225 | { |
304 | bool enableUpdateDebugging; | 226 | bool enableUpdateDebugging; |