aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes
diff options
context:
space:
mode:
authorMelanie Thielker2008-10-22 03:50:45 +0000
committerMelanie Thielker2008-10-22 03:50:45 +0000
commit659ad999937e63b5c512f983e07f3d5c18c67e77 (patch)
tree1f0301ae3387e8728f49c2bdd0a0f235448823fd /OpenSim/Region/Environment/Scenes
parentPrevent an object with a null RootPart in delete queue from stopping (diff)
downloadopensim-SC_OLD-659ad999937e63b5c512f983e07f3d5c18c67e77.zip
opensim-SC_OLD-659ad999937e63b5c512f983e07f3d5c18c67e77.tar.gz
opensim-SC_OLD-659ad999937e63b5c512f983e07f3d5c18c67e77.tar.bz2
opensim-SC_OLD-659ad999937e63b5c512f983e07f3d5c18c67e77.tar.xz
And fix it
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r--OpenSim/Region/Environment/Scenes/AsyncSceneObjectGroupDeleter.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Scenes/AsyncSceneObjectGroupDeleter.cs b/OpenSim/Region/Environment/Scenes/AsyncSceneObjectGroupDeleter.cs
index cbcbc5c..ca28bbd 100644
--- a/OpenSim/Region/Environment/Scenes/AsyncSceneObjectGroupDeleter.cs
+++ b/OpenSim/Region/Environment/Scenes/AsyncSceneObjectGroupDeleter.cs
@@ -119,7 +119,7 @@ namespace OpenSim.Region.Environment.Scenes
119 "[SCENE]: Sending deleted object to user's inventory, {0} item(s) remaining.", left); 119 "[SCENE]: Sending deleted object to user's inventory, {0} item(s) remaining.", left);
120 120
121 x = m_inventoryDeletes.Dequeue(); 121 x = m_inventoryDeletes.Dequeue();
122 if (x.objectGroup.RootObject != null) 122 if (x.objectGroup.RootPart != null)
123 { 123 {
124 try 124 try
125 { 125 {