diff options
| author | Freaky Tech | 2015-03-02 20:59:02 +0100 |
|---|---|---|
| committer | BlueWall | 2015-03-03 15:35:00 -0500 |
| commit | b8157174ca06995079a1680ab7f2c7929e2abde8 (patch) | |
| tree | 8c84bfb1bffd97a600ac56bd3e5c8b27835f62b4 /OpenSim/Region | |
| parent | corrected response when a not existing folder is requested by a viewer in tha... (diff) | |
| download | opensim-SC_OLD-b8157174ca06995079a1680ab7f2c7929e2abde8.zip opensim-SC_OLD-b8157174ca06995079a1680ab7f2c7929e2abde8.tar.gz opensim-SC_OLD-b8157174ca06995079a1680ab7f2c7929e2abde8.tar.bz2 opensim-SC_OLD-b8157174ca06995079a1680ab7f2c7929e2abde8.tar.xz | |
corrected llResetScript according to description within LSL wiki
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs index d28b151..c06db05 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | |||
| @@ -970,12 +970,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
| 970 | 970 | ||
| 971 | EventQueue.Clear(); | 971 | EventQueue.Clear(); |
| 972 | m_Script.ResetVars(); | 972 | m_Script.ResetVars(); |
| 973 | string oldState = State; | ||
| 973 | State = "default"; | 974 | State = "default"; |
| 974 | 975 | ||
| 975 | Part.SetScriptEvents(ItemID, | 976 | Part.SetScriptEvents(ItemID, |
| 976 | (int)m_Script.GetStateEventFlags(State)); | 977 | (int)m_Script.GetStateEventFlags(State)); |
| 977 | 978 | ||
| 978 | if (m_CurrentEvent != "state_entry") | 979 | if (m_CurrentEvent != "state_entry" || oldState != "default") |
| 979 | { | 980 | { |
| 980 | m_SaveState = StatePersistedHere; | 981 | m_SaveState = StatePersistedHere; |
| 981 | PostEvent(new EventParams("state_entry", | 982 | PostEvent(new EventParams("state_entry", |