From 9907c0fd10a18fbe9b17c1296442373cb0ccc848 Mon Sep 17 00:00:00 2001
From: Teravus Ovares
Date: Tue, 29 Apr 2008 13:53:24 +0000
Subject: Patch from Melanie: 0001087: Crash to bash de-linking objects.
Thanks Melanie!
---
OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
(limited to 'OpenSim/Region')
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
public void DelinkFromGroup(uint partID)
{
SceneObjectPart linkPart = GetChildPart(partID);
- linkPart.ClearUndoState();
+
if (null != linkPart)
{
+ linkPart.ClearUndoState();
// m_log.DebugFormat(
// "[SCENE OBJECT GROUP]: Delinking part {0}, {1} from group with root part {2}, {3}",
// linkPart.Name, linkPart.UUID, RootPart.Name, RootPart.UUID);
--
cgit v1.1