diff options
author | David Rowe | 2014-01-25 12:44:39 -0800 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2014-01-31 00:24:52 +0000 |
commit | 1380b37d71d50bb2e701f3e0a70ab0f1e2aa3407 (patch) | |
tree | 19493306290a2789c3d2767c7998cec68e90d69f /OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |
parent | Replaced throwing exceptions with calls to Error() (diff) | |
download | opensim-SC_OLD-1380b37d71d50bb2e701f3e0a70ab0f1e2aa3407.zip opensim-SC_OLD-1380b37d71d50bb2e701f3e0a70ab0f1e2aa3407.tar.gz opensim-SC_OLD-1380b37d71d50bb2e701f3e0a70ab0f1e2aa3407.tar.bz2 opensim-SC_OLD-1380b37d71d50bb2e701f3e0a70ab0f1e2aa3407.tar.xz |
Made error messages more consistent
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index ae9f827..6991831 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -261,7 +261,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
261 | if ((item = GetScriptByName(name)) != UUID.Zero) | 261 | if ((item = GetScriptByName(name)) != UUID.Zero) |
262 | m_ScriptEngine.ResetScript(item); | 262 | m_ScriptEngine.ResetScript(item); |
263 | else | 263 | else |
264 | Error("llResetOtherScript", "Script " + name + " not found"); | 264 | Error("llResetOtherScript", "Can't find script '" + name + "'"); |
265 | } | 265 | } |
266 | 266 | ||
267 | public LSL_Integer llGetScriptState(string name) | 267 | public LSL_Integer llGetScriptState(string name) |
@@ -275,7 +275,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
275 | return m_ScriptEngine.GetScriptState(item) ?1:0; | 275 | return m_ScriptEngine.GetScriptState(item) ?1:0; |
276 | } | 276 | } |
277 | 277 | ||
278 | Error("llGetScriptState", "Script " + name + " not found"); | 278 | Error("llGetScriptState", "Can't find script '" + name + "'"); |
279 | 279 | ||
280 | // If we didn't find it, then it's safe to | 280 | // If we didn't find it, then it's safe to |
281 | // assume it is not running. | 281 | // assume it is not running. |
@@ -298,7 +298,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
298 | } | 298 | } |
299 | else | 299 | else |
300 | { | 300 | { |
301 | Error("llSetScriptState", "Script " + name + " not found"); | 301 | Error("llSetScriptState", "Can't find script '" + name + "'"); |
302 | } | 302 | } |
303 | } | 303 | } |
304 | 304 | ||
@@ -2955,13 +2955,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2955 | 2955 | ||
2956 | if (item == null) | 2956 | if (item == null) |
2957 | { | 2957 | { |
2958 | Error("llRezAtRoot", "Could not find object " + inventory); | 2958 | Error("llRezAtRoot", "Can't 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 | Error("llRezAtRoot", "Unable to create requested object. Object is missing from database."); | 2964 | Error("llRezAtRoot", "Can't 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 | Error("llGiveInventory", "Could not parse key " + destination); | 4006 | Error("llGiveInventory", "Can't parse destination key '" + destination + "'"); |
4007 | return; | 4007 | return; |
4008 | } | 4008 | } |
4009 | 4009 | ||
@@ -4011,7 +4011,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
4011 | 4011 | ||
4012 | if (item == null) | 4012 | if (item == null) |
4013 | { | 4013 | { |
4014 | Error("llGiveInventory", String.Format("Could not find object '{0}'", inventory)); | 4014 | Error("llGiveInventory", "Can't find inventory object '" + inventory + "'"); |
4015 | } | 4015 | } |
4016 | 4016 | ||
4017 | UUID objId = item.ItemID; | 4017 | UUID objId = item.ItemID; |
@@ -4035,7 +4035,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
4035 | 4035 | ||
4036 | if (account == null) | 4036 | if (account == null) |
4037 | { | 4037 | { |
4038 | Error("llGiveInventory", "Can't find destination " + destId.ToString()); | 4038 | Error("llGiveInventory", "Can't find destination '" + destId.ToString() + "'"); |
4039 | return; | 4039 | return; |
4040 | } | 4040 | } |
4041 | } | 4041 | } |
@@ -6875,7 +6875,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
6875 | 6875 | ||
6876 | if (!UUID.TryParse(target, out destId)) | 6876 | if (!UUID.TryParse(target, out destId)) |
6877 | { | 6877 | { |
6878 | Error("llRemoteLoadScriptPin", "Could not parse key " + target); | 6878 | Error("llRemoteLoadScriptPin", "Can't parse key '" + target + "'"); |
6879 | return; | 6879 | return; |
6880 | } | 6880 | } |
6881 | 6881 | ||
@@ -6891,7 +6891,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
6891 | // make sure the object is a script | 6891 | // make sure the object is a script |
6892 | if (item == null || item.Type != 10) | 6892 | if (item == null || item.Type != 10) |
6893 | { | 6893 | { |
6894 | Error("llRemoteLoadScriptPin", "Could not find script " + name); | 6894 | Error("llRemoteLoadScriptPin", "Can't find script '" + name + "'"); |
6895 | return; | 6895 | return; |
6896 | } | 6896 | } |
6897 | 6897 | ||
@@ -9719,7 +9719,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
9719 | 9719 | ||
9720 | if (item == null) | 9720 | if (item == null) |
9721 | { | 9721 | { |
9722 | Error("llGetInventoryCreator", "Cannot find item '" + item + "'"); | 9722 | Error("llGetInventoryCreator", "Can't find item '" + item + "'"); |
9723 | 9723 | ||
9724 | return String.Empty; | 9724 | return String.Empty; |
9725 | } | 9725 | } |
@@ -11322,7 +11322,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
11322 | if (assetID == UUID.Zero) | 11322 | if (assetID == UUID.Zero) |
11323 | { | 11323 | { |
11324 | // => complain loudly, as specified by the LSL docs | 11324 | // => complain loudly, as specified by the LSL docs |
11325 | Error("llGetNumberOfNotecardLines", "Notecard '" + name + "' could not be found"); | 11325 | Error("llGetNumberOfNotecardLines", "Can't find notecard '" + name + "'"); |
11326 | 11326 | ||
11327 | return UUID.Zero.ToString(); | 11327 | return UUID.Zero.ToString(); |
11328 | } | 11328 | } |
@@ -11344,7 +11344,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
11344 | { | 11344 | { |
11345 | if (a == null || a.Type != 7) | 11345 | if (a == null || a.Type != 7) |
11346 | { | 11346 | { |
11347 | Error("llGetNumberOfNotecardLines", "Notecard '" + name + "' could not be found"); | 11347 | Error("llGetNumberOfNotecardLines", "Can't find notecard '" + name + "'"); |
11348 | return; | 11348 | return; |
11349 | } | 11349 | } |
11350 | 11350 | ||
@@ -11375,7 +11375,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
11375 | if (assetID == UUID.Zero) | 11375 | if (assetID == UUID.Zero) |
11376 | { | 11376 | { |
11377 | // => complain loudly, as specified by the LSL docs | 11377 | // => complain loudly, as specified by the LSL docs |
11378 | Error("llGetNotecardLine", "Notecard '" + name + "' could not be found"); | 11378 | Error("llGetNotecardLine", "Can't find notecard '" + name + "'"); |
11379 | 11379 | ||
11380 | return UUID.Zero.ToString(); | 11380 | return UUID.Zero.ToString(); |
11381 | } | 11381 | } |
@@ -11398,7 +11398,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
11398 | { | 11398 | { |
11399 | if (a == null || a.Type != 7) | 11399 | if (a == null || a.Type != 7) |
11400 | { | 11400 | { |
11401 | Error("llGetNotecardLine", "Notecard '" + name + "' could not be found"); | 11401 | Error("llGetNotecardLine", "Can't find notecard '" + name + "'"); |
11402 | return; | 11402 | return; |
11403 | } | 11403 | } |
11404 | 11404 | ||