aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine
diff options
context:
space:
mode:
authorDavid Rowe2014-01-24 17:33:12 -0800
committerJustin Clark-Casey (justincc)2014-01-31 00:24:43 +0000
commitd405254971b2e33dc9a469701689d91af5693e75 (patch)
tree2d39d3a421d7a79d6e6181d147e191dbb6b982dd /OpenSim/Region/ScriptEngine
parentReplaced LSLError() calls with calls to Error() (diff)
downloadopensim-SC_OLD-d405254971b2e33dc9a469701689d91af5693e75.zip
opensim-SC_OLD-d405254971b2e33dc9a469701689d91af5693e75.tar.gz
opensim-SC_OLD-d405254971b2e33dc9a469701689d91af5693e75.tar.bz2
opensim-SC_OLD-d405254971b2e33dc9a469701689d91af5693e75.tar.xz
Replaced llSay()ing LSL errors with calls Error()
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs17
1 files changed, 8 insertions, 9 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 02b4007..24b473d 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -2955,13 +2955,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2955 2955
2956 if (item == null) 2956 if (item == null)
2957 { 2957 {
2958 llSay(0, "Could not find object " + inventory); 2958 Error("llRezAtRoot", "Could not find object " + inventory);
2959 return; 2959 return;
2960 } 2960 }
2961 2961
2962 if (item.InvType != (int)InventoryType.Object) 2962 if (item.InvType != (int)InventoryType.Object)
2963 { 2963 {
2964 llSay(0, "Unable to create requested object. Object is missing from database."); 2964 Error("llRezAtRoot", "Unable to create requested object. Object is missing from database.");
2965 return; 2965 return;
2966 } 2966 }
2967 2967
@@ -4003,7 +4003,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4003 4003
4004 if (!UUID.TryParse(destination, out destId)) 4004 if (!UUID.TryParse(destination, out destId))
4005 { 4005 {
4006 llSay(0, "Could not parse key " + destination); 4006 Error("llGiveInventory", "Could not parse key " + destination);
4007 return; 4007 return;
4008 } 4008 }
4009 4009
@@ -4011,8 +4011,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4011 4011
4012 if (item == null) 4012 if (item == null)
4013 { 4013 {
4014 llSay(0, String.Format("Could not find object '{0}'", inventory)); 4014 Error("llGiveInventory", String.Format("Could not find object '{0}'", inventory));
4015 throw new Exception(String.Format("The inventory object '{0}' could not be found", inventory));
4016 } 4015 }
4017 4016
4018 UUID objId = item.ItemID; 4017 UUID objId = item.ItemID;
@@ -4036,7 +4035,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4036 4035
4037 if (account == null) 4036 if (account == null)
4038 { 4037 {
4039 llSay(0, "Can't find destination "+destId.ToString()); 4038 Error("llGiveInventory", "Can't find destination " + destId.ToString());
4040 return; 4039 return;
4041 } 4040 }
4042 } 4041 }
@@ -6876,7 +6875,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6876 6875
6877 if (!UUID.TryParse(target, out destId)) 6876 if (!UUID.TryParse(target, out destId))
6878 { 6877 {
6879 llSay(0, "Could not parse key " + target); 6878 Error("llRemoteLoadScriptPin", "Could not parse key " + target);
6880 return; 6879 return;
6881 } 6880 }
6882 6881
@@ -6892,7 +6891,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6892 // make sure the object is a script 6891 // make sure the object is a script
6893 if (item == null || item.Type != 10) 6892 if (item == null || item.Type != 10)
6894 { 6893 {
6895 llSay(0, "Could not find script " + name); 6894 Error("llRemoteLoadScriptPin", "Could not find script " + name);
6896 return; 6895 return;
6897 } 6896 }
6898 6897
@@ -9718,7 +9717,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9718 9717
9719 if (item == null) 9718 if (item == null)
9720 { 9719 {
9721 llSay(0, "No item name '" + item + "'"); 9720 Error("llGetInventoryCreator", "Cannot find item '" + item + "'");
9722 9721
9723 return String.Empty; 9722 return String.Empty;
9724 } 9723 }