OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Replaced llSay()ing LSL errors with calls Error()

justincc-master
David Rowe 2014-01-24 17:33:12 -08:00 committed by Justin Clark-Casey (justincc)
parent 9db4090c07
commit d405254971
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
View File

@ -2955,13 +2955,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if (item == null) if (item == null)
{ {
llSay(0, "Could not find object " + inventory); Error("llRezAtRoot", "Could not find object " + inventory);
return; return;
} }
if (item.InvType != (int)InventoryType.Object) if (item.InvType != (int)InventoryType.Object)
{ {
llSay(0, "Unable to create requested object. Object is missing from database."); Error("llRezAtRoot", "Unable to create requested object. Object is missing from database.");
return; return;
} }
@ -4003,7 +4003,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if (!UUID.TryParse(destination, out destId)) if (!UUID.TryParse(destination, out destId))
{ {
llSay(0, "Could not parse key " + destination); Error("llGiveInventory", "Could not parse key " + destination);
return; return;
} }
@ -4011,8 +4011,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if (item == null) if (item == null)
{ {
llSay(0, String.Format("Could not find object '{0}'", inventory)); Error("llGiveInventory", String.Format("Could not find object '{0}'", inventory));
throw new Exception(String.Format("The inventory object '{0}' could not be found", inventory));
} }
UUID objId = item.ItemID; UUID objId = item.ItemID;
@ -4036,7 +4035,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if (account == null) if (account == null)
{ {
llSay(0, "Can't find destination "+destId.ToString()); Error("llGiveInventory", "Can't find destination " + destId.ToString());
return; return;
} }
} }
@ -6876,7 +6875,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if (!UUID.TryParse(target, out destId)) if (!UUID.TryParse(target, out destId))
{ {
llSay(0, "Could not parse key " + target); Error("llRemoteLoadScriptPin", "Could not parse key " + target);
return; return;
} }
@ -6892,7 +6891,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
// make sure the object is a script // make sure the object is a script
if (item == null || item.Type != 10) if (item == null || item.Type != 10)
{ {
llSay(0, "Could not find script " + name); Error("llRemoteLoadScriptPin", "Could not find script " + name);
return; return;
} }
@ -9718,7 +9717,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if (item == null) if (item == null)
{ {
llSay(0, "No item name '" + item + "'"); Error("llGetInventoryCreator", "Cannot find item '" + item + "'");
return String.Empty; return String.Empty;
} }