diff options
author | Melanie Thielker | 2008-11-09 19:30:40 +0000 |
---|---|---|
committer | Melanie Thielker | 2008-11-09 19:30:40 +0000 |
commit | 664e8a464e4608afeb590a3330ccc69e7988138b (patch) | |
tree | 099c17a1769a7e7ac16232c5a20f5d9515a1d480 /OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | |
parent | Cause llGetInventoryType to return the asset type, which corresponds with (diff) | |
download | opensim-SC-664e8a464e4608afeb590a3330ccc69e7988138b.zip opensim-SC-664e8a464e4608afeb590a3330ccc69e7988138b.tar.gz opensim-SC-664e8a464e4608afeb590a3330ccc69e7988138b.tar.bz2 opensim-SC-664e8a464e4608afeb590a3330ccc69e7988138b.tar.xz |
Script region crossing. This has not user functionality, but lays all the
groundwork.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs index 30f03ac..08a97f07 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | |||
@@ -286,6 +286,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
286 | PostEvent(new EventParams("changed", | 286 | PostEvent(new EventParams("changed", |
287 | new Object[] {new LSL_Types.LSLInteger(256)}, new DetectParams[0])); | 287 | new Object[] {new LSL_Types.LSLInteger(256)}, new DetectParams[0])); |
288 | } | 288 | } |
289 | else if (stateSource == StateSource.PrimCrossing) | ||
290 | { | ||
291 | // CHANGED_REGION | ||
292 | PostEvent(new EventParams("changed", | ||
293 | new Object[] {new LSL_Types.LSLInteger(512)}, new DetectParams[0])); | ||
294 | } | ||
289 | } | 295 | } |
290 | } | 296 | } |
291 | else | 297 | else |
@@ -313,6 +319,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
313 | } | 319 | } |
314 | else | 320 | else |
315 | { | 321 | { |
322 | ScenePresence presence = m_Engine.World.GetScenePresence(part.OwnerID); | ||
323 | |||
324 | if (presence != null && (!postOnRez)) | ||
325 | presence.ControllingClient.SendAgentAlertMessage("Compile successful", false); | ||
326 | |||
316 | // m_Engine.Log.ErrorFormat("[Script] Unable to load script state, file not found"); | 327 | // m_Engine.Log.ErrorFormat("[Script] Unable to load script state, file not found"); |
317 | Start(); | 328 | Start(); |
318 | PostEvent(new EventParams("state_entry", | 329 | PostEvent(new EventParams("state_entry", |
@@ -856,8 +867,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
856 | 867 | ||
857 | public string GetXMLState() | 868 | public string GetXMLState() |
858 | { | 869 | { |
870 | bool run = Running; | ||
859 | Stop(100); | 871 | Stop(100); |
872 | Running = run; | ||
860 | return ScriptSerializer.Serialize(this); | 873 | return ScriptSerializer.Serialize(this); |
874 | Running = false; | ||
861 | } | 875 | } |
862 | } | 876 | } |
863 | } | 877 | } |