diff options
| author | Kevin Cozens | 2014-08-18 16:00:49 -0400 |
|---|---|---|
| committer | Kevin Cozens | 2014-08-18 16:00:49 -0400 |
| commit | 321816b32ca2f051b2cab204de6d59075aaf1fd0 (patch) | |
| tree | 017b4f9494fa4b4eb6d21fc065c7a7c54754b12f /OpenSim | |
| parent | Don't allow the last behavior to be removed from a pCampbot bot (diff) | |
| download | opensim-SC-321816b32ca2f051b2cab204de6d59075aaf1fd0.zip opensim-SC-321816b32ca2f051b2cab204de6d59075aaf1fd0.tar.gz opensim-SC-321816b32ca2f051b2cab204de6d59075aaf1fd0.tar.bz2 opensim-SC-321816b32ca2f051b2cab204de6d59075aaf1fd0.tar.xz | |
Prevent exception if inventory item in llGiveInventory() call doesn't exist.
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 0e6e8bb..50e4804 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
| @@ -4138,6 +4138,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 4138 | if (item == null) | 4138 | if (item == null) |
| 4139 | { | 4139 | { |
| 4140 | Error("llGiveInventory", "Can't find inventory object '" + inventory + "'"); | 4140 | Error("llGiveInventory", "Can't find inventory object '" + inventory + "'"); |
| 4141 | return; | ||
| 4141 | } | 4142 | } |
| 4142 | 4143 | ||
| 4143 | UUID objId = item.ItemID; | 4144 | UUID objId = item.ItemID; |