diff options
| author | John Hurliman | 2009-10-19 15:19:37 -0700 |
|---|---|---|
| committer | John Hurliman | 2009-10-19 15:19:37 -0700 |
| commit | bd03cbd8156e2044eed89ba2774bab43b9931aa1 (patch) | |
| tree | c6dc15d4028b2d103b89296ac68b84482b77f5e8 /OpenSim/Region/ScriptEngine/Shared | |
| parent | * Change Util.FireAndForget to use ThreadPool.UnsafeQueueUserWorkItem(). This... (diff) | |
| parent | Minor formatting cleanup. (diff) | |
| download | opensim-SC_OLD-bd03cbd8156e2044eed89ba2774bab43b9931aa1.zip opensim-SC_OLD-bd03cbd8156e2044eed89ba2774bab43b9931aa1.tar.gz opensim-SC_OLD-bd03cbd8156e2044eed89ba2774bab43b9931aa1.tar.bz2 opensim-SC_OLD-bd03cbd8156e2044eed89ba2774bab43b9931aa1.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into prioritization
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs index 97166cf..2b858ec 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | |||
| @@ -353,15 +353,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
| 353 | // m_log.ErrorFormat("[Script] Unable to load script state from xml: {0}\n"+e.ToString(), xml); | 353 | // m_log.ErrorFormat("[Script] Unable to load script state from xml: {0}\n"+e.ToString(), xml); |
| 354 | } | 354 | } |
| 355 | } | 355 | } |
| 356 | else | 356 | // else |
| 357 | { | 357 | // { |
| 358 | ScenePresence presence = m_Engine.World.GetScenePresence(part.OwnerID); | 358 | // ScenePresence presence = m_Engine.World.GetScenePresence(part.OwnerID); |
| 359 | 359 | ||
| 360 | if (presence != null && (!postOnRez)) | 360 | // if (presence != null && (!postOnRez)) |
| 361 | presence.ControllingClient.SendAgentAlertMessage("Compile successful", false); | 361 | // presence.ControllingClient.SendAgentAlertMessage("Compile successful", false); |
| 362 | 362 | ||
| 363 | // // m_log.ErrorFormat("[Script] Unable to load script state, file not found"); | 363 | // } |
| 364 | } | ||
| 365 | } | 364 | } |
| 366 | 365 | ||
| 367 | public void Init() | 366 | public void Init() |