Revert "Allow OSSL scripts to softfail"

This reverts commit e5244fe70830d6c9ece23d26039d5cbabe9ce9ff.

Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs

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
                         ScenePresence sp = World.GetScenePresence(ownerID);
                         if (sp != null && !sp.IsDeleted && sp.IsGod)
                         {
-                            return "Softfail";
+                            return String.Empty;
                         }
                     }
 
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
 
                                 if(e.InnerException != null && e.InnerException is ScriptException)
                                 {
-                                    if (e.InnerException.Message != "Softfail")
-                                    {
-                                        string text = e.InnerException.Message +
-                                                    "(script: " + ScriptName +
-                                                    " event: " + data.EventName +
-                                                    " at " + Part.AbsolutePosition + ")";
-                                        if (text.Length > 1000)
-                                            text = text.Substring(0, 1000);
-                                        Engine.World.SimChat(Utils.StringToBytes(text),
-                                                               ChatTypeEnum.DebugChannel, 2147483647,
-                                                               Part.AbsolutePosition,
-                                                               Part.Name, Part.UUID, false);
-                                        m_log.Debug(string.Format(
-                                            "[SCRIPT INSTANCE]: {0} (at event {1}, part {2} {3} at {4} in {5}",
-                                            e.InnerException.Message,
-                                            data.EventName,
-                                            PrimName,
-                                            Part.UUID,
-                                            Part.AbsolutePosition,
-                                            Part.ParentGroup.Scene.Name));
-
-                                    }
+                                    string text = e.InnerException.Message +
+                                                "(script: " + ScriptName +
+                                                " event: " + data.EventName +
+                                                " at " + Part.AbsolutePosition + ")";
+                                    if (text.Length > 1000)
+                                        text = text.Substring(0, 1000);
+                                    Engine.World.SimChat(Utils.StringToBytes(text),
+                                                           ChatTypeEnum.DebugChannel, 2147483647,
+                                                           Part.AbsolutePosition,
+                                                           Part.Name, Part.UUID, false);
+                                    m_log.Debug(string.Format(
+                                        "[SCRIPT INSTANCE]: {0} (at event {1}, part {2} {3} at {4} in {5}",
+                                        e.InnerException.Message,
+                                        data.EventName,
+                                        PrimName,
+                                        Part.UUID,
+                                        Part.AbsolutePosition,
+                                        Part.ParentGroup.Scene.Name));
+
                                 }
                                 else
                                 {