diff options
| author | UbitUmarov | 2016-12-14 16:31:39 +0000 |
|---|---|---|
| committer | UbitUmarov | 2016-12-14 16:31:39 +0000 |
| commit | 3056926403fb073d26ba11b3ebbcbd424a948dbf (patch) | |
| tree | ead961c3913b1bd27d28cfc9eb17e1f1844a8b54 /OpenSim | |
| parent | restrict osDie to objects rezzed by the script object group and a few more ch... (diff) | |
| download | opensim-SC-3056926403fb073d26ba11b3ebbcbd424a948dbf.zip opensim-SC-3056926403fb073d26ba11b3ebbcbd424a948dbf.tar.gz opensim-SC-3056926403fb073d26ba11b3ebbcbd424a948dbf.tar.bz2 opensim-SC-3056926403fb073d26ba11b3ebbcbd424a948dbf.tar.xz | |
dont self osDie attachments
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index 87fe287..c83682e 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
| @@ -1897,7 +1897,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 1897 | 1897 | ||
| 1898 | // harakiri check | 1898 | // harakiri check |
| 1899 | if(objUUID == UUID.Zero) | 1899 | if(objUUID == UUID.Zero) |
| 1900 | throw new SelfDeleteException(); | 1900 | { |
| 1901 | if (!m_host.ParentGroup.IsAttachment) | ||
| 1902 | throw new SelfDeleteException(); | ||
| 1903 | return; | ||
| 1904 | } | ||
| 1901 | 1905 | ||
| 1902 | SceneObjectGroup sceneOG = World.GetSceneObjectGroup(objUUID); | 1906 | SceneObjectGroup sceneOG = World.GetSceneObjectGroup(objUUID); |
| 1903 | 1907 | ||