aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorAdam Frisby2007-09-24 15:56:34 +0000
committerAdam Frisby2007-09-24 15:56:34 +0000
commitf5eac12a88d2b7fd5011cc3634191e51849f2394 (patch)
treefb635d8bfe028d3626658805eb8c03c14e3be192
parent* Refactored the central update loop - now easier to work with. Switching fro... (diff)
downloadopensim-SC_OLD-f5eac12a88d2b7fd5011cc3634191e51849f2394.zip
opensim-SC_OLD-f5eac12a88d2b7fd5011cc3634191e51849f2394.tar.gz
opensim-SC_OLD-f5eac12a88d2b7fd5011cc3634191e51849f2394.tar.bz2
opensim-SC_OLD-f5eac12a88d2b7fd5011cc3634191e51849f2394.tar.xz
* Renamed ScriptConsole to PluginConsole for clarity
* Fixed a bug where ODE tries to do a physics update for zero frames.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs6
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneEvents.cs10
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneManager.cs2
-rw-r--r--OpenSim/Region/ExtensionsScriptModule/Engines/CSharp/Examples/ExportRegionToLSL.cs2
4 files changed, 10 insertions, 10 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 4e9cbe3..94d1deb 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -220,9 +220,9 @@ namespace OpenSim.Region.Environment.Scenes
220 220
221 #region Script Handling Methods 221 #region Script Handling Methods
222 222
223 public void SendCommandToScripts(string[] args) 223 public void SendCommandToPlugins(string[] args)
224 { 224 {
225 m_eventManager.TriggerOnScriptConsole(args); 225 m_eventManager.TriggerOnPluginConsole(args);
226 } 226 }
227 227
228 #endregion 228 #endregion
@@ -275,7 +275,7 @@ namespace OpenSim.Region.Environment.Scenes
275 275
276 if (m_frame % m_update_physics == 0) 276 if (m_frame % m_update_physics == 0)
277 UpdatePhysics( 277 UpdatePhysics(
278 Math.Min(SinceLastFrame.TotalSeconds, 0.001) 278 Math.Min(SinceLastFrame.TotalSeconds, m_timespan)
279 ); 279 );
280 280
281 if (m_frame % m_update_entities == 0) 281 if (m_frame % m_update_entities == 0)
diff --git a/OpenSim/Region/Environment/Scenes/SceneEvents.cs b/OpenSim/Region/Environment/Scenes/SceneEvents.cs
index 8e8e9a7..4f0ffc7 100644
--- a/OpenSim/Region/Environment/Scenes/SceneEvents.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneEvents.cs
@@ -37,9 +37,9 @@ namespace OpenSim.Region.Environment.Scenes
37 37
38 public event OnParcelPrimCountAddDelegate OnParcelPrimCountAdd; 38 public event OnParcelPrimCountAddDelegate OnParcelPrimCountAdd;
39 39
40 public delegate void OnScriptConsoleDelegate(string[] args); 40 public delegate void OnPluginConsoleDelegate(string[] args);
41 41
42 public event OnScriptConsoleDelegate OnScriptConsole; 42 public event OnPluginConsoleDelegate OnPluginConsole;
43 43
44 public delegate void OnShutdownDelegate(); 44 public delegate void OnShutdownDelegate();
45 45
@@ -66,10 +66,10 @@ namespace OpenSim.Region.Environment.Scenes
66 OnPermissionError(user, reason); 66 OnPermissionError(user, reason);
67 } 67 }
68 68
69 public void TriggerOnScriptConsole(string[] args) 69 public void TriggerOnPluginConsole(string[] args)
70 { 70 {
71 if (OnScriptConsole != null) 71 if (OnPluginConsole != null)
72 OnScriptConsole(args); 72 OnPluginConsole(args);
73 } 73 }
74 74
75 public void TriggerOnFrame() 75 public void TriggerOnFrame()
diff --git a/OpenSim/Region/Environment/Scenes/SceneManager.cs b/OpenSim/Region/Environment/Scenes/SceneManager.cs
index 196976c..0049282 100644
--- a/OpenSim/Region/Environment/Scenes/SceneManager.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneManager.cs
@@ -82,7 +82,7 @@ namespace OpenSim.Region.Environment.Scenes
82 82
83 public void SendCommandToCurrentSceneScripts(string[] cmdparams) 83 public void SendCommandToCurrentSceneScripts(string[] cmdparams)
84 { 84 {
85 ForEachCurrentScene(delegate(Scene scene) { scene.SendCommandToScripts(cmdparams); }); 85 ForEachCurrentScene(delegate(Scene scene) { scene.SendCommandToPlugins(cmdparams); });
86 } 86 }
87 87
88 public void SetBypassPermissionsOnCurrentScene(bool bypassPermissions) 88 public void SetBypassPermissionsOnCurrentScene(bool bypassPermissions)
diff --git a/OpenSim/Region/ExtensionsScriptModule/Engines/CSharp/Examples/ExportRegionToLSL.cs b/OpenSim/Region/ExtensionsScriptModule/Engines/CSharp/Examples/ExportRegionToLSL.cs
index 466a902..2043979 100644
--- a/OpenSim/Region/ExtensionsScriptModule/Engines/CSharp/Examples/ExportRegionToLSL.cs
+++ b/OpenSim/Region/ExtensionsScriptModule/Engines/CSharp/Examples/ExportRegionToLSL.cs
@@ -21,7 +21,7 @@ namespace OpenSim.Region.ExtensionsScriptModule.CSharp.Examples
21 { 21 {
22 script = scriptInfo; 22 script = scriptInfo;
23 23
24 script.events.OnScriptConsole += new EventManager.OnScriptConsoleDelegate(ProcessConsoleMsg); 24 script.events.OnPluginConsole += new EventManager.OnPluginConsoleDelegate(ProcessConsoleMsg);
25 } 25 }
26 26
27 void ProcessConsoleMsg(string[] args) 27 void ProcessConsoleMsg(string[] args)