diff options
| author | Melanie Thielker | 2017-01-07 23:36:07 +0000 |
|---|---|---|
| committer | Melanie Thielker | 2017-01-07 23:36:07 +0000 |
| commit | 556d95ef0581c01e9018e80cc06f755f288d2bca (patch) | |
| tree | c3ebf79da8e115a5c9acb39ea1315ef4950fbe2c /OpenSim/Region | |
| parent | Fix a compile issue and reintroduce the "GOD" script option (diff) | |
| download | opensim-SC-556d95ef0581c01e9018e80cc06f755f288d2bca.zip opensim-SC-556d95ef0581c01e9018e80cc06f755f288d2bca.tar.gz opensim-SC-556d95ef0581c01e9018e80cc06f755f288d2bca.tar.bz2 opensim-SC-556d95ef0581c01e9018e80cc06f755f288d2bca.tar.xz | |
Revert "Allow OSSL scripts to softfail"
This reverts commit e5244fe70830d6c9ece23d26039d5cbabe9ce9ff.
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | 41 |
2 files changed, 20 insertions, 23 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index 5b783f7..e769c6d 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
| @@ -440,7 +440,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 440 | ScenePresence sp = World.GetScenePresence(ownerID); | 440 | ScenePresence sp = World.GetScenePresence(ownerID); |
| 441 | if (sp != null && !sp.IsDeleted && sp.IsGod) | 441 | if (sp != null && !sp.IsDeleted && sp.IsGod) |
| 442 | { | 442 | { |
| 443 | return "Softfail"; | 443 | return String.Empty; |
| 444 | } | 444 | } |
| 445 | } | 445 | } |
| 446 | 446 | ||
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs index de0a80d..9d72b1c 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | |||
| @@ -927,28 +927,25 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
| 927 | 927 | ||
| 928 | if(e.InnerException != null && e.InnerException is ScriptException) | 928 | if(e.InnerException != null && e.InnerException is ScriptException) |
| 929 | { | 929 | { |
| 930 | if (e.InnerException.Message != "Softfail") | 930 | string text = e.InnerException.Message + |
| 931 | { | 931 | "(script: " + ScriptName + |
| 932 | string text = e.InnerException.Message + | 932 | " event: " + data.EventName + |
| 933 | "(script: " + ScriptName + | 933 | " at " + Part.AbsolutePosition + ")"; |
| 934 | " event: " + data.EventName + | 934 | if (text.Length > 1000) |
| 935 | " at " + Part.AbsolutePosition + ")"; | 935 | text = text.Substring(0, 1000); |
| 936 | if (text.Length > 1000) | 936 | Engine.World.SimChat(Utils.StringToBytes(text), |
| 937 | text = text.Substring(0, 1000); | 937 | ChatTypeEnum.DebugChannel, 2147483647, |
| 938 | Engine.World.SimChat(Utils.StringToBytes(text), | 938 | Part.AbsolutePosition, |
| 939 | ChatTypeEnum.DebugChannel, 2147483647, | 939 | Part.Name, Part.UUID, false); |
| 940 | Part.AbsolutePosition, | 940 | m_log.Debug(string.Format( |
| 941 | Part.Name, Part.UUID, false); | 941 | "[SCRIPT INSTANCE]: {0} (at event {1}, part {2} {3} at {4} in {5}", |
| 942 | m_log.Debug(string.Format( | 942 | e.InnerException.Message, |
| 943 | "[SCRIPT INSTANCE]: {0} (at event {1}, part {2} {3} at {4} in {5}", | 943 | data.EventName, |
| 944 | e.InnerException.Message, | 944 | PrimName, |
| 945 | data.EventName, | 945 | Part.UUID, |
| 946 | PrimName, | 946 | Part.AbsolutePosition, |
| 947 | Part.UUID, | 947 | Part.ParentGroup.Scene.Name)); |
| 948 | Part.AbsolutePosition, | 948 | |
| 949 | Part.ParentGroup.Scene.Name)); | ||
| 950 | |||
| 951 | } | ||
| 952 | } | 949 | } |
| 953 | else | 950 | else |
| 954 | { | 951 | { |