aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-01-13 17:01:57 +0000
committerJustin Clarke Casey2009-01-13 17:01:57 +0000
commitfeba3cc3ff1f651bebdf06f53df40643ed742542 (patch)
treed8ff980bd9dcad671ec1db27df284994600027be
parent* minor: Add a couple of code comments about enabling httpserver logging (diff)
downloadopensim-SC_OLD-feba3cc3ff1f651bebdf06f53df40643ed742542.zip
opensim-SC_OLD-feba3cc3ff1f651bebdf06f53df40643ed742542.tar.gz
opensim-SC_OLD-feba3cc3ff1f651bebdf06f53df40643ed742542.tar.bz2
opensim-SC_OLD-feba3cc3ff1f651bebdf06f53df40643ed742542.tar.xz
* Removing set-time command since it doesn't actually do anything at all
* If this was crucial to someone then it should be reinsertable as a module
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Application/OpenSim.cs5
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs16
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneManager.cs10
3 files changed, 0 insertions, 31 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index 4440fe1..3db7176 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -235,10 +235,6 @@ namespace OpenSim
235 m_assetCache.Clear(); 235 m_assetCache.Clear();
236 break; 236 break;
237 237
238 case "set-time":
239 m_sceneManager.SetCurrentSceneTimePhase(Convert.ToInt32(cmdparams[0]));
240 break;
241
242 case "force-update": 238 case "force-update":
243 m_console.Notice("Updating all clients"); 239 m_console.Notice("Updating all clients");
244 m_sceneManager.ForceCurrentSceneClientUpdate(); 240 m_sceneManager.ForceCurrentSceneClientUpdate();
@@ -679,7 +675,6 @@ namespace OpenSim
679 m_console.Notice("load-oar [filename] - load an OpenSimulator region archive. This replaces everything in the current region."); 675 m_console.Notice("load-oar [filename] - load an OpenSimulator region archive. This replaces everything in the current region.");
680 m_console.Notice("save-oar [filename] - Save the current region to an OpenSimulator region archive."); 676 m_console.Notice("save-oar [filename] - Save the current region to an OpenSimulator region archive.");
681 m_console.Notice("script - manually trigger scripts? or script commands?"); 677 m_console.Notice("script - manually trigger scripts? or script commands?");
682 m_console.Notice("set-time [x] - set the current scene time phase");
683 m_console.Notice("show assets - show state of asset cache."); 678 m_console.Notice("show assets - show state of asset cache.");
684 m_console.Notice("show modules - shows info about loaded modules."); 679 m_console.Notice("show modules - shows info about loaded modules.");
685 m_console.Notice("show queues - show packet queues length for all clients."); 680 m_console.Notice("show queues - show packet queues length for all clients.");
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 37ff645..09eb0e6 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -80,8 +80,6 @@ namespace OpenSim.Region.Environment.Scenes
80 /// TODO: Possibly stop other classes being able to manipulate this directly. 80 /// TODO: Possibly stop other classes being able to manipulate this directly.
81 public SceneGraph m_sceneGraph; 81 public SceneGraph m_sceneGraph;
82 82
83 private int m_timePhase = 24;
84
85 /// <summary> 83 /// <summary>
86 /// Are we applying physics to any of the prims in this scene? 84 /// Are we applying physics to any of the prims in this scene?
87 /// </summary> 85 /// </summary>
@@ -245,11 +243,6 @@ namespace OpenSim.Region.Environment.Scenes
245 get { return StatsReporter.getLastReportedSimFPS(); } 243 get { return StatsReporter.getLastReportedSimFPS(); }
246 } 244 }
247 245
248 public int TimePhase
249 {
250 get { return m_timePhase; }
251 }
252
253 public string DefaultScriptEngine 246 public string DefaultScriptEngine
254 { 247 {
255 get { return m_defaultScriptEngine; } 248 get { return m_defaultScriptEngine; }
@@ -3356,15 +3349,6 @@ namespace OpenSim.Region.Environment.Scenes
3356 3349
3357 #region Other Methods 3350 #region Other Methods
3358 3351
3359 /// <summary>
3360 ///
3361 /// </summary>
3362 /// <param name="phase"></param>
3363 public void SetTimePhase(int phase)
3364 {
3365 m_timePhase = phase;
3366 }
3367
3368 public virtual void StoreAddFriendship(UUID ownerID, UUID friendID, uint perms) 3352 public virtual void StoreAddFriendship(UUID ownerID, UUID friendID, uint perms)
3369 { 3353 {
3370 m_sceneGridService.AddNewUserFriend(ownerID, friendID, perms); 3354 m_sceneGridService.AddNewUserFriend(ownerID, friendID, perms);
diff --git a/OpenSim/Region/Environment/Scenes/SceneManager.cs b/OpenSim/Region/Environment/Scenes/SceneManager.cs
index 5541454..040a0d4 100644
--- a/OpenSim/Region/Environment/Scenes/SceneManager.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneManager.cs
@@ -483,16 +483,6 @@ namespace OpenSim.Region.Environment.Scenes
483 return null; 483 return null;
484 } 484 }
485 485
486 public void SetCurrentSceneTimePhase(int timePhase)
487 {
488 ForEachCurrentScene(delegate(Scene scene)
489 {
490 scene.SetTimePhase(
491 timePhase)
492 ;
493 });
494 }
495
496 public void ForceCurrentSceneClientUpdate() 486 public void ForceCurrentSceneClientUpdate()
497 { 487 {
498 ForEachCurrentScene(delegate(Scene scene) { scene.ForceClientUpdate(); }); 488 ForEachCurrentScene(delegate(Scene scene) { scene.ForceClientUpdate(); });