diff options
author | Justin Clark-Casey (justincc) | 2014-07-29 00:13:29 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2014-07-29 00:13:29 +0100 |
commit | f6f7585ec583788b11960cf5a1ac36409e6583aa (patch) | |
tree | e5e7e8f12244b5e2d679158204aca0e6c24073d4 /OpenSim/Region/OptionalModules | |
parent | BulletSim: rearrange code for sensing whether shapes have been (diff) | |
download | opensim-SC-f6f7585ec583788b11960cf5a1ac36409e6583aa.zip opensim-SC-f6f7585ec583788b11960cf5a1ac36409e6583aa.tar.gz opensim-SC-f6f7585ec583788b11960cf5a1ac36409e6583aa.tar.bz2 opensim-SC-f6f7585ec583788b11960cf5a1ac36409e6583aa.tar.xz |
Add a "debug scene set child-repri <double>" command that allows child reprioritization distance to be changed on the fly.
This governs when child agent position changes are sent to neighbouring regions.
Corresponding config parameter is ChildReprioritizationDistance in [InterestManagement] in OpenSim.ini
For test purposes.
Diffstat (limited to 'OpenSim/Region/OptionalModules')
-rw-r--r-- | OpenSim/Region/OptionalModules/World/SceneCommands/SceneCommandsModule.cs | 44 |
1 files changed, 28 insertions, 16 deletions
diff --git a/OpenSim/Region/OptionalModules/World/SceneCommands/SceneCommandsModule.cs b/OpenSim/Region/OptionalModules/World/SceneCommands/SceneCommandsModule.cs index 5fb74b0..5347945 100644 --- a/OpenSim/Region/OptionalModules/World/SceneCommands/SceneCommandsModule.cs +++ b/OpenSim/Region/OptionalModules/World/SceneCommands/SceneCommandsModule.cs | |||
@@ -93,28 +93,30 @@ namespace OpenSim.Region.OptionalModules.Avatar.Attachments | |||
93 | "Debug", this, "debug scene get", | 93 | "Debug", this, "debug scene get", |
94 | "debug scene get", | 94 | "debug scene get", |
95 | "List current scene options.", | 95 | "List current scene options.", |
96 | "If active is false then main scene update and maintenance loops are suspended.\n" | 96 | "active - if false then main scene update and maintenance loops are suspended.\n" |
97 | + "If animations is true then extra animations debug information is logged.\n" | 97 | + "animations - if true then extra animations debug information is logged.\n" |
98 | + "If collisions is false then collisions with other objects are turned off.\n" | 98 | + "child-repri - how far an avatar must move in meters before we update the position of its child agents in neighbouring regions.\n" |
99 | + "If pbackup is false then periodic scene backup is turned off.\n" | 99 | + "collisions - if false then collisions with other objects are turned off.\n" |
100 | + "If physics is false then all physics objects are non-physical.\n" | 100 | + "pbackup - if false then periodic scene backup is turned off.\n" |
101 | + "If scripting is false then no scripting operations happen.\n" | 101 | + "physics - if false then all physics objects are non-physical.\n" |
102 | + "If teleport is true then some extra teleport debug information is logged.\n" | 102 | + "scripting - if false then no scripting operations happen.\n" |
103 | + "If updates is true then any frame which exceeds double the maximum desired frame time is logged.", | 103 | + "teleport - if true then some extra teleport debug information is logged.\n" |
104 | + "updates - if true then any frame which exceeds double the maximum desired frame time is logged.", | ||
104 | HandleDebugSceneGetCommand); | 105 | HandleDebugSceneGetCommand); |
105 | 106 | ||
106 | scene.AddCommand( | 107 | scene.AddCommand( |
107 | "Debug", this, "debug scene set", | 108 | "Debug", this, "debug scene set", |
108 | "debug scene set active|collisions|pbackup|physics|scripting|teleport|updates true|false", | 109 | "debug scene set active|collisions|pbackup|physics|scripting|teleport|updates true|false", |
109 | "Turn on scene debugging options.", | 110 | "Turn on scene debugging options.", |
110 | "If active is 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" |
111 | + "If animations is true then extra animations debug information is logged.\n" | 112 | + "animations - if true then extra animations debug information is logged.\n" |
112 | + "If collisions is false then collisions with other objects are turned off.\n" | 113 | + "child-repri - how far an avatar must move in meters before we update the position of its child agents in neighbouring regions.\n" |
113 | + "If pbackup is false then periodic scene backup is turned off.\n" | 114 | + "collisions - if false then collisions with other objects are turned off.\n" |
114 | + "If physics is false then all physics objects are non-physical.\n" | 115 | + "pbackup - if false then periodic scene backup is turned off.\n" |
115 | + "If scripting is false then no scripting operations happen.\n" | 116 | + "physics - if false then all physics objects are non-physical.\n" |
116 | + "If teleport is true then some extra teleport debug information is logged.\n" | 117 | + "scripting - if false then no scripting operations happen.\n" |
117 | + "If updates is true then any frame which exceeds double the maximum desired frame time is logged.", | 118 | + "teleport - if true then some extra teleport debug information is logged.\n" |
119 | + "updates - if true then any frame which exceeds double the maximum desired frame time is logged.", | ||
118 | HandleDebugSceneSetCommand); | 120 | HandleDebugSceneSetCommand); |
119 | } | 121 | } |
120 | 122 | ||
@@ -138,6 +140,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Attachments | |||
138 | ConsoleDisplayList cdl = new ConsoleDisplayList(); | 140 | ConsoleDisplayList cdl = new ConsoleDisplayList(); |
139 | cdl.AddRow("active", m_scene.Active); | 141 | cdl.AddRow("active", m_scene.Active); |
140 | cdl.AddRow("animations", m_scene.DebugAnimations); | 142 | cdl.AddRow("animations", m_scene.DebugAnimations); |
143 | cdl.AddRow("child-repri", m_scene.ChildReprioritizationDistance); | ||
141 | cdl.AddRow("pbackup", m_scene.PeriodicBackup); | 144 | cdl.AddRow("pbackup", m_scene.PeriodicBackup); |
142 | cdl.AddRow("physics", m_scene.PhysicsEnabled); | 145 | cdl.AddRow("physics", m_scene.PhysicsEnabled); |
143 | cdl.AddRow("scripting", m_scene.ScriptsEnabled); | 146 | cdl.AddRow("scripting", m_scene.ScriptsEnabled); |
@@ -186,6 +189,15 @@ namespace OpenSim.Region.OptionalModules.Avatar.Attachments | |||
186 | m_scene.DebugAnimations = active; | 189 | m_scene.DebugAnimations = active; |
187 | } | 190 | } |
188 | 191 | ||
192 | if (options.ContainsKey("child-repri")) | ||
193 | { | ||
194 | double childRepriDistance; | ||
195 | |||
196 | // FIXME: This can only come from the console at the moment but might not always be true. | ||
197 | if (ConsoleUtil.TryParseConsoleDouble(MainConsole.Instance, options["child-repri"], out childRepriDistance)) | ||
198 | m_scene.ChildReprioritizationDistance = childRepriDistance; | ||
199 | } | ||
200 | |||
189 | if (options.ContainsKey("pbackup")) | 201 | if (options.ContainsKey("pbackup")) |
190 | { | 202 | { |
191 | bool active; | 203 | bool active; |