aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2014-08-06 00:34:09 +0100
committerJustin Clark-Casey (justincc)2014-08-06 00:35:26 +0100
commit961cb9cc77e2d056011f9b9d8b3baffd834b28b9 (patch)
tree87258c28fc9fd927b0f0d55403cb7ea83922e724
parentFixed premature closing of the connection in DataSnapshotManager (diff)
downloadopensim-SC_OLD-961cb9cc77e2d056011f9b9d8b3baffd834b28b9.zip
opensim-SC_OLD-961cb9cc77e2d056011f9b9d8b3baffd834b28b9.tar.gz
opensim-SC_OLD-961cb9cc77e2d056011f9b9d8b3baffd834b28b9.tar.bz2
opensim-SC_OLD-961cb9cc77e2d056011f9b9d8b3baffd834b28b9.tar.xz
refactor: Rename recent new Client*UpdateTolerance to Root*UpdateTolerance for better accuracy and consistency with other similar parameters
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs18
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs8
-rw-r--r--OpenSim/Region/OptionalModules/World/SceneCommands/SceneCommandsModule.cs12
3 files changed, 19 insertions, 19 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index cb2c4cd..da99d4f 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -233,19 +233,19 @@ namespace OpenSim.Region.Framework.Scenes
233 public bool SendPeriodicAppearanceUpdates { get; set; } 233 public bool SendPeriodicAppearanceUpdates { get; set; }
234 234
235 /// <summary> 235 /// <summary>
236 /// How much a client has to change position before updates are sent to viewers. 236 /// How much a root agent has to change position before updates are sent to viewers.
237 /// </summary> 237 /// </summary>
238 public float ClientPositionUpdateTolerance { get; set; } 238 public float RootPositionUpdateTolerance { get; set; }
239 239
240 /// <summary> 240 /// <summary>
241 /// How much a client has to rotate before updates are sent to viewers. 241 /// How much a root agent has to rotate before updates are sent to viewers.
242 /// </summary> 242 /// </summary>
243 public float ClientRotationUpdateTolerance { get; set; } 243 public float RootRotationUpdateTolerance { get; set; }
244 244
245 /// <summary> 245 /// <summary>
246 /// How much a client has to change velocity before updates are sent to viewers. 246 /// How much a root agent has to change velocity before updates are sent to viewers.
247 /// </summary> 247 /// </summary>
248 public float ClientVelocityUpdateTolerance { get; set; } 248 public float RootVelocityUpdateTolerance { get; set; }
249 249
250 /// <summary> 250 /// <summary>
251 /// If greater than 1, we only send terse updates to other root agents on every n updates. 251 /// If greater than 1, we only send terse updates to other root agents on every n updates.
@@ -1071,9 +1071,9 @@ namespace OpenSim.Region.Framework.Scenes
1071 PeriodicBackup = true; 1071 PeriodicBackup = true;
1072 UseBackup = true; 1072 UseBackup = true;
1073 1073
1074 ClientRotationUpdateTolerance = 0.01f; 1074 RootRotationUpdateTolerance = 0.01f;
1075 ClientVelocityUpdateTolerance = 0.001f; 1075 RootVelocityUpdateTolerance = 0.001f;
1076 ClientPositionUpdateTolerance = 0.05f; 1076 RootPositionUpdateTolerance = 0.05f;
1077 ChildReprioritizationDistance = 20.0; 1077 ChildReprioritizationDistance = 20.0;
1078 1078
1079 m_eventManager = new EventManager(); 1079 m_eventManager = new EventManager();
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index c7db306..e792d3f 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -3200,12 +3200,12 @@ namespace OpenSim.Region.Framework.Scenes
3200 // checks on all updates but the ramifications of this would need careful consideration. 3200 // checks on all updates but the ramifications of this would need careful consideration.
3201 bool updateClients 3201 bool updateClients
3202 = IsSatOnObject && (Rotation != m_lastRotation || Velocity != m_lastVelocity || m_pos != m_lastPosition); 3202 = IsSatOnObject && (Rotation != m_lastRotation || Velocity != m_lastVelocity || m_pos != m_lastPosition);
3203 3203
3204 if (!updateClients) 3204 if (!updateClients)
3205 updateClients 3205 updateClients
3206 = !Rotation.ApproxEquals(m_lastRotation, Scene.ClientRotationUpdateTolerance) 3206 = !Rotation.ApproxEquals(m_lastRotation, Scene.RootRotationUpdateTolerance)
3207 || !Velocity.ApproxEquals(m_lastVelocity, Scene.ClientVelocityUpdateTolerance) 3207 || !Velocity.ApproxEquals(m_lastVelocity, Scene.RootVelocityUpdateTolerance)
3208 || !m_pos.ApproxEquals(m_lastPosition, Scene.ClientPositionUpdateTolerance); 3208 || !m_pos.ApproxEquals(m_lastPosition, Scene.RootPositionUpdateTolerance);
3209 3209
3210 if (updateClients) 3210 if (updateClients)
3211 { 3211 {
diff --git a/OpenSim/Region/OptionalModules/World/SceneCommands/SceneCommandsModule.cs b/OpenSim/Region/OptionalModules/World/SceneCommands/SceneCommandsModule.cs
index 0dc47f9..f2595c8 100644
--- a/OpenSim/Region/OptionalModules/World/SceneCommands/SceneCommandsModule.cs
+++ b/OpenSim/Region/OptionalModules/World/SceneCommands/SceneCommandsModule.cs
@@ -154,9 +154,9 @@ namespace OpenSim.Region.OptionalModules.Avatar.Attachments
154 cdl.AddRow("animations", m_scene.DebugAnimations); 154 cdl.AddRow("animations", m_scene.DebugAnimations);
155 cdl.AddRow("appear-refresh", m_scene.SendPeriodicAppearanceUpdates); 155 cdl.AddRow("appear-refresh", m_scene.SendPeriodicAppearanceUpdates);
156 cdl.AddRow("child-repri", m_scene.ChildReprioritizationDistance); 156 cdl.AddRow("child-repri", m_scene.ChildReprioritizationDistance);
157 cdl.AddRow("client-pos-upd", m_scene.ClientPositionUpdateTolerance); 157 cdl.AddRow("client-pos-upd", m_scene.RootPositionUpdateTolerance);
158 cdl.AddRow("client-rot-upd", m_scene.ClientRotationUpdateTolerance); 158 cdl.AddRow("client-rot-upd", m_scene.RootRotationUpdateTolerance);
159 cdl.AddRow("client-vel-upd", m_scene.ClientVelocityUpdateTolerance); 159 cdl.AddRow("client-vel-upd", m_scene.RootVelocityUpdateTolerance);
160 cdl.AddRow("root-upd-per", m_scene.RootTerseUpdatePeriod); 160 cdl.AddRow("root-upd-per", m_scene.RootTerseUpdatePeriod);
161 cdl.AddRow("child-upd-per", m_scene.ChildTerseUpdatePeriod); 161 cdl.AddRow("child-upd-per", m_scene.ChildTerseUpdatePeriod);
162 cdl.AddRow("pbackup", m_scene.PeriodicBackup); 162 cdl.AddRow("pbackup", m_scene.PeriodicBackup);
@@ -230,7 +230,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Attachments
230 230
231 // FIXME: This can only come from the console at the moment but might not always be true. 231 // FIXME: This can only come from the console at the moment but might not always be true.
232 if (ConsoleUtil.TryParseConsoleFloat(MainConsole.Instance, options["client-pos-upd"], out newValue)) 232 if (ConsoleUtil.TryParseConsoleFloat(MainConsole.Instance, options["client-pos-upd"], out newValue))
233 m_scene.ClientPositionUpdateTolerance = newValue; 233 m_scene.RootPositionUpdateTolerance = newValue;
234 } 234 }
235 235
236 if (options.ContainsKey("client-rot-upd")) 236 if (options.ContainsKey("client-rot-upd"))
@@ -239,7 +239,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Attachments
239 239
240 // FIXME: This can only come from the console at the moment but might not always be true. 240 // FIXME: This can only come from the console at the moment but might not always be true.
241 if (ConsoleUtil.TryParseConsoleFloat(MainConsole.Instance, options["client-rot-upd"], out newValue)) 241 if (ConsoleUtil.TryParseConsoleFloat(MainConsole.Instance, options["client-rot-upd"], out newValue))
242 m_scene.ClientRotationUpdateTolerance = newValue; 242 m_scene.RootRotationUpdateTolerance = newValue;
243 } 243 }
244 244
245 if (options.ContainsKey("client-vel-upd")) 245 if (options.ContainsKey("client-vel-upd"))
@@ -248,7 +248,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Attachments
248 248
249 // FIXME: This can only come from the console at the moment but might not always be true. 249 // FIXME: This can only come from the console at the moment but might not always be true.
250 if (ConsoleUtil.TryParseConsoleFloat(MainConsole.Instance, options["client-vel-upd"], out newValue)) 250 if (ConsoleUtil.TryParseConsoleFloat(MainConsole.Instance, options["client-vel-upd"], out newValue))
251 m_scene.ClientVelocityUpdateTolerance = newValue; 251 m_scene.RootVelocityUpdateTolerance = newValue;
252 } 252 }
253 253
254 if (options.ContainsKey("root-upd-per")) 254 if (options.ContainsKey("root-upd-per"))