aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie2011-02-07 22:25:43 +0100
committerMelanie2011-02-07 22:25:43 +0100
commite8ba3d3a101a8b797021a9915b02c1bbfdf33448 (patch)
tree7ee00a93968cd405abd371fd640ef682234c4d46 /OpenSim
parentAdd another flag (diff)
downloadopensim-SC_OLD-e8ba3d3a101a8b797021a9915b02c1bbfdf33448.zip
opensim-SC_OLD-e8ba3d3a101a8b797021a9915b02c1bbfdf33448.tar.gz
opensim-SC_OLD-e8ba3d3a101a8b797021a9915b02c1bbfdf33448.tar.bz2
opensim-SC_OLD-e8ba3d3a101a8b797021a9915b02c1bbfdf33448.tar.xz
Prevent a nonexistent inventory item from throwing an exception
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 59e905e..cdaaab3 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -4195,7 +4195,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4195 if (!found) 4195 if (!found)
4196 { 4196 {
4197 llSay(0, String.Format("Could not find object '{0}'", inventory)); 4197 llSay(0, String.Format("Could not find object '{0}'", inventory));
4198 throw new Exception(String.Format("The inventory object '{0}' could not be found", inventory)); 4198 return;
4199// throw new Exception(String.Format("The inventory object '{0}' could not be found", inventory));
4199 } 4200 }
4200 4201
4201 // check if destination is an object 4202 // check if destination is an object