diff options
| author | Melanie Thielker | 2009-04-12 12:03:07 +0000 |
|---|---|---|
| committer | Melanie Thielker | 2009-04-12 12:03:07 +0000 |
| commit | 2864c45678a6e2557b6e2fda294d06cc8bfcec10 (patch) | |
| tree | 24d4ad155281339b3f4a313622ffd25d538d5bdb /OpenSim/Region/ScriptEngine/Shared/Api | |
| parent | Fix a regression where animations would only be sent if the avatar has (diff) | |
| download | opensim-SC-2864c45678a6e2557b6e2fda294d06cc8bfcec10.zip opensim-SC-2864c45678a6e2557b6e2fda294d06cc8bfcec10.tar.gz opensim-SC-2864c45678a6e2557b6e2fda294d06cc8bfcec10.tar.bz2 opensim-SC-2864c45678a6e2557b6e2fda294d06cc8bfcec10.tar.xz | |
Actually remove the script if it tries to remove itself.
Fixes Mantis #2929
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 5 |
1 files changed, 4 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 f4e7990..0964821 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
| @@ -3577,7 +3577,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 3577 | { | 3577 | { |
| 3578 | if (item.Name == name) | 3578 | if (item.Name == name) |
| 3579 | { | 3579 | { |
| 3580 | m_host.Inventory.RemoveInventoryItem(item.ItemID); | 3580 | if (item.ItemID == m_itemID) |
| 3581 | throw new ScriptDeleteException(); | ||
| 3582 | else | ||
| 3583 | m_host.Inventory.RemoveInventoryItem(item.ItemID); | ||
| 3581 | return; | 3584 | return; |
| 3582 | } | 3585 | } |
| 3583 | } | 3586 | } |