diff options
| author | dr scofield (aka dirk husemann) | 2009-10-01 09:48:02 +0200 |
|---|---|---|
| committer | dr scofield (aka dirk husemann) | 2009-10-01 09:48:02 +0200 |
| commit | 9dcf7da42abfaf20a6a2ec552868dd37cc3e7261 (patch) | |
| tree | a9c5145dea2ade7981922dffeed134c8e1a493ef /OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs | |
| parent | adding skeleton test case for LandDataSerializer [w-i-p] (diff) | |
| parent | Removed an innefficent List.Contains lookup from UpdateQueue (diff) | |
| download | opensim-SC_OLD-9dcf7da42abfaf20a6a2ec552868dd37cc3e7261.zip opensim-SC_OLD-9dcf7da42abfaf20a6a2ec552868dd37cc3e7261.tar.gz opensim-SC_OLD-9dcf7da42abfaf20a6a2ec552868dd37cc3e7261.tar.bz2 opensim-SC_OLD-9dcf7da42abfaf20a6a2ec552868dd37cc3e7261.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into x-opensim
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs index 8ad916c..3c91b29 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs | |||
| @@ -418,7 +418,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine | |||
| 418 | { | 418 | { |
| 419 | InstanceData id = m_ScriptManager.GetScript(localID, itemID); | 419 | InstanceData id = m_ScriptManager.GetScript(localID, itemID); |
| 420 | if (id == null) | 420 | if (id == null) |
| 421 | return; | 421 | return; |
| 422 | 422 | ||
| 423 | if (!id.Disabled) | 423 | if (!id.Disabled) |
| 424 | id.Running = true; | 424 | id.Running = true; |
| @@ -428,7 +428,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine | |||
| 428 | { | 428 | { |
| 429 | InstanceData id = m_ScriptManager.GetScript(localID, itemID); | 429 | InstanceData id = m_ScriptManager.GetScript(localID, itemID); |
| 430 | if (id == null) | 430 | if (id == null) |
| 431 | return; | 431 | return; |
| 432 | 432 | ||
| 433 | id.Running = false; | 433 | id.Running = false; |
| 434 | } | 434 | } |
| @@ -442,7 +442,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine | |||
| 442 | 442 | ||
| 443 | InstanceData id = m_ScriptManager.GetScript(localID, itemID); | 443 | InstanceData id = m_ScriptManager.GetScript(localID, itemID); |
| 444 | if (id == null) | 444 | if (id == null) |
| 445 | return; | 445 | return; |
| 446 | 446 | ||
| 447 | IEventQueue eq = World.RequestModuleInterface<IEventQueue>(); | 447 | IEventQueue eq = World.RequestModuleInterface<IEventQueue>(); |
| 448 | if (eq == null) | 448 | if (eq == null) |