aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
diff options
context:
space:
mode:
authorTeravus Ovares2008-04-29 13:53:24 +0000
committerTeravus Ovares2008-04-29 13:53:24 +0000
commit9907c0fd10a18fbe9b17c1296442373cb0ccc848 (patch)
treef794a210fd21b011d41d3577dfc4af05f27050e9 /OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
parent* Applying Xantor's patch 0001089 - Added llRot2Angle, llRot2Axis,llAxisAngle... (diff)
downloadopensim-SC_OLD-9907c0fd10a18fbe9b17c1296442373cb0ccc848.zip
opensim-SC_OLD-9907c0fd10a18fbe9b17c1296442373cb0ccc848.tar.gz
opensim-SC_OLD-9907c0fd10a18fbe9b17c1296442373cb0ccc848.tar.bz2
opensim-SC_OLD-9907c0fd10a18fbe9b17c1296442373cb0ccc848.tar.xz
Patch from Melanie: 0001087: Crash to bash de-linking objects. Thanks Melanie!
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index c5fdcaf..c28e66f 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -1814,9 +1814,10 @@ namespace OpenSim.Region.Environment.Scenes
1814 public void DelinkFromGroup(uint partID) 1814 public void DelinkFromGroup(uint partID)
1815 { 1815 {
1816 SceneObjectPart linkPart = GetChildPart(partID); 1816 SceneObjectPart linkPart = GetChildPart(partID);
1817 linkPart.ClearUndoState(); 1817
1818 if (null != linkPart) 1818 if (null != linkPart)
1819 { 1819 {
1820 linkPart.ClearUndoState();
1820// m_log.DebugFormat( 1821// m_log.DebugFormat(
1821// "[SCENE OBJECT GROUP]: Delinking part {0}, {1} from group with root part {2}, {3}", 1822// "[SCENE OBJECT GROUP]: Delinking part {0}, {1} from group with root part {2}, {3}",
1822// linkPart.Name, linkPart.UUID, RootPart.Name, RootPart.UUID); 1823// linkPart.Name, linkPart.UUID, RootPart.Name, RootPart.UUID);