aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/AsyncSceneObjectGroupDeleter.cs
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-12-17 16:11:03 +0000
committerJustin Clarke Casey2008-12-17 16:11:03 +0000
commitb4680f653dbc1c6f712898af79c4ea22bca3f678 (patch)
tree8482ca109db6d7e4b51221f0631c483a4a2d0fef /OpenSim/Region/Environment/Scenes/AsyncSceneObjectGroupDeleter.cs
parent* Adding some locks to XEngine's m_PrimObjects which were prone to 'the colle... (diff)
downloadopensim-SC_OLD-b4680f653dbc1c6f712898af79c4ea22bca3f678.zip
opensim-SC_OLD-b4680f653dbc1c6f712898af79c4ea22bca3f678.tar.gz
opensim-SC_OLD-b4680f653dbc1c6f712898af79c4ea22bca3f678.tar.bz2
opensim-SC_OLD-b4680f653dbc1c6f712898af79c4ea22bca3f678.tar.xz
* Implement 'Save Object Back to My Inventory'. On the Linden client this is in the Tools menu available when editing an object
* This facility allows you to save changes to an object that you've rezzed into a region back into their original inventory item without having to take a copy of the rezzed object.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/AsyncSceneObjectGroupDeleter.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/AsyncSceneObjectGroupDeleter.cs10
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/Environment/Scenes/AsyncSceneObjectGroupDeleter.cs b/OpenSim/Region/Environment/Scenes/AsyncSceneObjectGroupDeleter.cs
index 03b3977..1429452 100644
--- a/OpenSim/Region/Environment/Scenes/AsyncSceneObjectGroupDeleter.cs
+++ b/OpenSim/Region/Environment/Scenes/AsyncSceneObjectGroupDeleter.cs
@@ -110,7 +110,7 @@ namespace OpenSim.Region.Environment.Scenes
110 110
111 while (InventoryDeQueueAndDelete()) 111 while (InventoryDeQueueAndDelete())
112 { 112 {
113 m_log.Debug("[SCENE]: Returned item successfully to inventory, continuing..."); 113 m_log.Debug("[SCENE]: Sent item successfully to inventory, continuing...");
114 } 114 }
115 } 115 }
116 116
@@ -130,7 +130,7 @@ namespace OpenSim.Region.Environment.Scenes
130 if (left > 0) 130 if (left > 0)
131 { 131 {
132 m_log.DebugFormat( 132 m_log.DebugFormat(
133 "[SCENE]: Sending deleted object to user's inventory, {0} item(s) remaining.", left); 133 "[SCENE]: Sending object to user's inventory, {0} item(s) remaining.", left);
134 134
135 x = m_inventoryDeletes.Dequeue(); 135 x = m_inventoryDeletes.Dequeue();
136 136
@@ -142,7 +142,7 @@ namespace OpenSim.Region.Environment.Scenes
142 } 142 }
143 catch (Exception e) 143 catch (Exception e)
144 { 144 {
145 m_log.DebugFormat("Exception background deleting object: " + e); 145 m_log.DebugFormat("Exception background sending object: " + e);
146 } 146 }
147 147
148 return true; 148 return true;
@@ -154,11 +154,11 @@ namespace OpenSim.Region.Environment.Scenes
154 // We can't put the object group details in here since the root part may have disappeared (which is where these sit). 154 // We can't put the object group details in here since the root part may have disappeared (which is where these sit).
155 // FIXME: This needs to be fixed. 155 // FIXME: This needs to be fixed.
156 m_log.ErrorFormat( 156 m_log.ErrorFormat(
157 "[SCENE]: Queued deletion of scene object to agent {0} {1} failed: {2}", 157 "[SCENE]: Queued sending of scene object to agent {0} {1} failed: {2}",
158 (x != null ? x.remoteClient.Name : "unavailable"), (x != null ? x.remoteClient.AgentId.ToString() : "unavailable"), e.ToString()); 158 (x != null ? x.remoteClient.Name : "unavailable"), (x != null ? x.remoteClient.AgentId.ToString() : "unavailable"), e.ToString());
159 } 159 }
160 160
161 m_log.Debug("[SCENE]: No objects left in inventory delete queue."); 161 m_log.Debug("[SCENE]: No objects left in inventory send queue.");
162 return false; 162 return false;
163 } 163 }
164 } 164 }