Prevent an object with a null RootPart in delete queue from stopping
the deleting of other, valid objects0.6.0-stable
							parent
							
								
									f9b3ef32c6
								
							
						
					
					
						commit
						a8523dddb6
					
				|  | @ -119,10 +119,19 @@ namespace OpenSim.Region.Environment.Scenes | |||
|                             "[SCENE]: Sending deleted object to user's inventory, {0} item(s) remaining.", left); | ||||
|                          | ||||
|                         x = m_inventoryDeletes.Dequeue(); | ||||
|                         m_scene.DeleteToInventory(x.destination, | ||||
|                                 x.folderID, x.objectGroup, x.remoteClient, | ||||
|                                 x.permissionToDelete); | ||||
|                          | ||||
|                         if (x.objectGroup.RootObject != null) | ||||
|                         { | ||||
|                             try | ||||
|                             { | ||||
|                                 m_scene.DeleteToInventory(x.destination, | ||||
|                                         x.folderID, x.objectGroup, x.remoteClient, | ||||
|                                         x.permissionToDelete); | ||||
|                             } | ||||
|                             catch (Exception e) | ||||
|                             { | ||||
|                                 m_log.DebugFormat("Exception background deleting object: "+e.ToString()); | ||||
|                             } | ||||
|                         } | ||||
|                         return true; | ||||
|                     } | ||||
|                 } | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue
	
	 Melanie Thielker
						Melanie Thielker