diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs b/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs index 7ac1e7e..5b571c7 100644 --- a/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs +++ b/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs | |||
@@ -34,7 +34,7 @@ using OpenMetaverse; | |||
34 | using OpenSim.Framework; | 34 | using OpenSim.Framework; |
35 | 35 | ||
36 | namespace OpenSim.Region.Framework.Scenes | 36 | namespace OpenSim.Region.Framework.Scenes |
37 | { | 37 | { |
38 | class DeleteToInventoryHolder | 38 | class DeleteToInventoryHolder |
39 | { | 39 | { |
40 | public DeRezAction action; | 40 | public DeRezAction action; |
@@ -49,7 +49,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
49 | /// up the main client thread. | 49 | /// up the main client thread. |
50 | /// </summary> | 50 | /// </summary> |
51 | public class AsyncSceneObjectGroupDeleter | 51 | public class AsyncSceneObjectGroupDeleter |
52 | { | 52 | { |
53 | private static readonly ILog m_log | 53 | private static readonly ILog m_log |
54 | = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 54 | = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
55 | 55 | ||
@@ -58,16 +58,16 @@ namespace OpenSim.Region.Framework.Scenes | |||
58 | /// </value> | 58 | /// </value> |
59 | public bool Enabled; | 59 | public bool Enabled; |
60 | 60 | ||
61 | private Timer m_inventoryTicker = new Timer(2000); | 61 | private Timer m_inventoryTicker = new Timer(2000); |
62 | private readonly Queue<DeleteToInventoryHolder> m_inventoryDeletes = new Queue<DeleteToInventoryHolder>(); | 62 | private readonly Queue<DeleteToInventoryHolder> m_inventoryDeletes = new Queue<DeleteToInventoryHolder>(); |
63 | private Scene m_scene; | 63 | private Scene m_scene; |
64 | 64 | ||
65 | public AsyncSceneObjectGroupDeleter(Scene scene) | 65 | public AsyncSceneObjectGroupDeleter(Scene scene) |
66 | { | 66 | { |
67 | m_scene = scene; | 67 | m_scene = scene; |
68 | 68 | ||
69 | m_inventoryTicker.AutoReset = false; | 69 | m_inventoryTicker.AutoReset = false; |
70 | m_inventoryTicker.Elapsed += InventoryRunDeleteTimer; | 70 | m_inventoryTicker.Elapsed += InventoryRunDeleteTimer; |
71 | } | 71 | } |
72 | 72 | ||
73 | /// <summary> | 73 | /// <summary> |
@@ -113,7 +113,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
113 | { | 113 | { |
114 | //m_log.Debug("[SCENE]: Sent item successfully to inventory, continuing..."); | 114 | //m_log.Debug("[SCENE]: Sent item successfully to inventory, continuing..."); |
115 | } | 115 | } |
116 | } | 116 | } |
117 | 117 | ||
118 | /// <summary> | 118 | /// <summary> |
119 | /// Move the next object in the queue to inventory. Then delete it properly from the scene. | 119 | /// Move the next object in the queue to inventory. Then delete it properly from the scene. |
@@ -121,7 +121,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
121 | /// <returns></returns> | 121 | /// <returns></returns> |
122 | public bool InventoryDeQueueAndDelete() | 122 | public bool InventoryDeQueueAndDelete() |
123 | { | 123 | { |
124 | DeleteToInventoryHolder x = null; | 124 | DeleteToInventoryHolder x = null; |
125 | 125 | ||
126 | try | 126 | try |
127 | { | 127 | { |
@@ -142,9 +142,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
142 | 142 | ||
143 | try | 143 | try |
144 | { | 144 | { |
145 | m_scene.DeleteToInventory(x.action, x.folderID, x.objectGroup, x.remoteClient); | 145 | m_scene.DeleteToInventory(x.action, x.folderID, x.objectGroup, x.remoteClient); |
146 | if (x.permissionToDelete) | 146 | if (x.permissionToDelete) |
147 | m_scene.DeleteSceneObject(x.objectGroup, false); | 147 | m_scene.DeleteSceneObject(x.objectGroup, false); |
148 | } | 148 | } |
149 | catch (Exception e) | 149 | catch (Exception e) |
150 | { | 150 | { |
@@ -166,6 +166,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
166 | 166 | ||
167 | m_log.Debug("[SCENE]: No objects left in inventory send queue."); | 167 | m_log.Debug("[SCENE]: No objects left in inventory send queue."); |
168 | return false; | 168 | return false; |
169 | } | 169 | } |
170 | } | 170 | } |
171 | } | 171 | } |