ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-10 11:33:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

* Renamed ScriptConsole to PluginConsole for clarity

Browse Source 
* Fixed a bug where ODE tries to do a physics update for zero frames.
This commit is contained in:
Adam Frisby
2007-09-24 15:56:34 +00:00
parent 48e0e05446
commit f5eac12a88
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Region/Environment/Scenes/Scene.cs
View File

@@ -220,9 +220,9 @@ namespace OpenSim.Region.Environment.Scenes
#region Script Handling Methods
public void SendCommandToScripts(string[] args)
public void SendCommandToPlugins(string[] args)
{
m_eventManager.TriggerOnScriptConsole(args);
m_eventManager.TriggerOnPluginConsole(args);
}
#endregion
@@ -275,7 +275,7 @@ namespace OpenSim.Region.Environment.Scenes
if (m_frame % m_update_physics == 0)
UpdatePhysics(
Math.Min(SinceLastFrame.TotalSeconds, 0.001)
Math.Min(SinceLastFrame.TotalSeconds, m_timespan)
);
if (m_frame % m_update_entities == 0)

10
OpenSim/Region/Environment/Scenes/SceneEvents.cs
View File

@@ -37,9 +37,9 @@ namespace OpenSim.Region.Environment.Scenes
public event OnParcelPrimCountAddDelegate OnParcelPrimCountAdd;
public delegate void OnScriptConsoleDelegate(string[] args);
public delegate void OnPluginConsoleDelegate(string[] args);
public event OnScriptConsoleDelegate OnScriptConsole;
public event OnPluginConsoleDelegate OnPluginConsole;
public delegate void OnShutdownDelegate();
@@ -66,10 +66,10 @@ namespace OpenSim.Region.Environment.Scenes
OnPermissionError(user, reason);
}
public void TriggerOnScriptConsole(string[] args)
public void TriggerOnPluginConsole(string[] args)
{
if (OnScriptConsole != null)
OnScriptConsole(args);
if (OnPluginConsole != null)
OnPluginConsole(args);
}
public void TriggerOnFrame()

2
OpenSim/Region/Environment/Scenes/SceneManager.cs
View File

@@ -82,7 +82,7 @@ namespace OpenSim.Region.Environment.Scenes
public void SendCommandToCurrentSceneScripts(string[] cmdparams)
{
ForEachCurrentScene(delegate(Scene scene) { scene.SendCommandToScripts(cmdparams); });
ForEachCurrentScene(delegate(Scene scene) { scene.SendCommandToPlugins(cmdparams); });
}
public void SetBypassPermissionsOnCurrentScene(bool bypassPermissions)

2
OpenSim/Region/ExtensionsScriptModule/Engines/CSharp/Examples/ExportRegionToLSL.cs
View File

@@ -21,7 +21,7 @@ namespace OpenSim.Region.ExtensionsScriptModule.CSharp.Examples
{
script = scriptInfo;
script.events.OnScriptConsole += new EventManager.OnScriptConsoleDelegate(ProcessConsoleMsg);
script.events.OnPluginConsole += new EventManager.OnPluginConsoleDelegate(ProcessConsoleMsg);
}
void ProcessConsoleMsg(string[] args)