diff options
| author | CasperW | 2010-02-25 12:07:56 +0100 |
|---|---|---|
| committer | CasperW | 2010-02-25 12:07:56 +0100 |
| commit | e99341d7df66f73286b8a440991358cbca1a8399 (patch) | |
| tree | ba62fb2b3a700ecdab5abab8d473030cd7f4e7ea /OpenSim | |
| parent | Disable blocking teleports within the same parcel for now; it's not implement... (diff) | |
| download | opensim-SC_OLD-e99341d7df66f73286b8a440991358cbca1a8399.zip opensim-SC_OLD-e99341d7df66f73286b8a440991358cbca1a8399.tar.gz opensim-SC_OLD-e99341d7df66f73286b8a440991358cbca1a8399.tar.bz2 opensim-SC_OLD-e99341d7df66f73286b8a440991358cbca1a8399.tar.xz | |
llDie() should not work on attachments (results in an incosistent attachment state)
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 2 |
1 files changed, 1 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 824073b..7a6739b 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
| @@ -1118,7 +1118,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 1118 | public virtual void llDie() | 1118 | public virtual void llDie() |
| 1119 | { | 1119 | { |
| 1120 | m_host.AddScriptLPS(1); | 1120 | m_host.AddScriptLPS(1); |
| 1121 | throw new SelfDeleteException(); | 1121 | if (!m_host.IsAttachment) throw new SelfDeleteException(); |
| 1122 | } | 1122 | } |
| 1123 | 1123 | ||
| 1124 | public LSL_Float llGround(LSL_Vector offset) | 1124 | public LSL_Float llGround(LSL_Vector offset) |