diff options
author | Justin Clark-Casey (justincc) | 2012-02-08 21:58:59 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-02-08 22:19:34 +0000 |
commit | dfa19e23f03643762a10677203c088161a99557e (patch) | |
tree | ced1397f035e87f3b922a41892d41c7f30595e84 /OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |
parent | Make WebStats logging report consistently as WEB STATS MODULE instead of VC, ... (diff) | |
download | opensim-SC-dfa19e23f03643762a10677203c088161a99557e.zip opensim-SC-dfa19e23f03643762a10677203c088161a99557e.tar.gz opensim-SC-dfa19e23f03643762a10677203c088161a99557e.tar.bz2 opensim-SC-dfa19e23f03643762a10677203c088161a99557e.tar.xz |
Stop a scene object from attempting to link with itself (which results in an exception and constant complaints in v3 viewers).
Aims to address http://opensimulator.org/mantis/view.php?id=5878
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index b724135..5b838f8 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
@@ -1961,6 +1961,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
1961 | // "[SCENE OBJECT GROUP]: Linking group with root part {0}, {1} to group with root part {2}, {3}", | 1961 | // "[SCENE OBJECT GROUP]: Linking group with root part {0}, {1} to group with root part {2}, {3}", |
1962 | // objectGroup.RootPart.Name, objectGroup.RootPart.UUID, RootPart.Name, RootPart.UUID); | 1962 | // objectGroup.RootPart.Name, objectGroup.RootPart.UUID, RootPart.Name, RootPart.UUID); |
1963 | 1963 | ||
1964 | // Linking to ourselves is not a valid operation. | ||
1965 | if (objectGroup == this) | ||
1966 | return; | ||
1967 | |||
1964 | SceneObjectPart linkPart = objectGroup.m_rootPart; | 1968 | SceneObjectPart linkPart = objectGroup.m_rootPart; |
1965 | 1969 | ||
1966 | Vector3 oldGroupPosition = linkPart.GroupPosition; | 1970 | Vector3 oldGroupPosition = linkPart.GroupPosition; |