aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-05-01 21:53:02 +0000
committerJustin Clarke Casey2008-05-01 21:53:02 +0000
commitf16c997a74b2f10064d1c2c0d90dccc2a3a56cd7 (patch)
treead8c94a9637e7dc8b8cf79fc3e61a62eb53674c9 /OpenSim/Region/Environment/Scenes
parent* Refactor: Remove redundant userID from further up the inventory request chain (diff)
downloadopensim-SC-f16c997a74b2f10064d1c2c0d90dccc2a3a56cd7.zip
opensim-SC-f16c997a74b2f10064d1c2c0d90dccc2a3a56cd7.tar.gz
opensim-SC-f16c997a74b2f10064d1c2c0d90dccc2a3a56cd7.tar.bz2
opensim-SC-f16c997a74b2f10064d1c2c0d90dccc2a3a56cd7.tar.xz
* Minor: Normalise prim inventory log headers
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs16
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs10
2 files changed, 13 insertions, 13 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs
index 824a536..721680f 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs
@@ -54,7 +54,7 @@ namespace OpenSim.Region.Environment.Scenes
54 else 54 else
55 { 55 {
56 m_log.ErrorFormat( 56 m_log.ErrorFormat(
57 "[PRIMINVENTORY]: " + 57 "[PRIM INVENTORY]: " +
58 "Couldn't find part {0} in object group {1}, {2} to start script with ID {3}", 58 "Couldn't find part {0} in object group {1}, {2} to start script with ID {3}",
59 localID, Name, UUID, itemID); 59 localID, Name, UUID, itemID);
60 } 60 }
@@ -75,7 +75,7 @@ namespace OpenSim.Region.Environment.Scenes
75// else 75// else
76// { 76// {
77// m_log.ErrorFormat( 77// m_log.ErrorFormat(
78// "[PRIMINVENTORY]: " + 78// "[PRIM INVENTORY]: " +
79// "Couldn't find part {0} in object group {1}, {2} to start script with ID {3}", 79// "Couldn't find part {0} in object group {1}, {2} to start script with ID {3}",
80// localID, Name, UUID, itemID); 80// localID, Name, UUID, itemID);
81// } 81// }
@@ -123,7 +123,7 @@ namespace OpenSim.Region.Environment.Scenes
123 else 123 else
124 { 124 {
125 m_log.ErrorFormat( 125 m_log.ErrorFormat(
126 "[PRIMINVENTORY]: " + 126 "[PRIM INVENTORY]: " +
127 "Couldn't find part {0} in object group {1}, {2} to stop script with ID {3}", 127 "Couldn't find part {0} in object group {1}, {2} to stop script with ID {3}",
128 partID, Name, UUID, itemID); 128 partID, Name, UUID, itemID);
129 } 129 }
@@ -144,7 +144,7 @@ namespace OpenSim.Region.Environment.Scenes
144 else 144 else
145 { 145 {
146 m_log.ErrorFormat( 146 m_log.ErrorFormat(
147 "[PRIMINVENTORY]: " + 147 "[PRIM INVENTORY]: " +
148 "Couldn't find part {0} in object group {1}, {2} to retreive prim inventory", 148 "Couldn't find part {0} in object group {1}, {2} to retreive prim inventory",
149 localID, Name, UUID); 149 localID, Name, UUID);
150 } 150 }
@@ -166,7 +166,7 @@ namespace OpenSim.Region.Environment.Scenes
166 else 166 else
167 { 167 {
168 m_log.ErrorFormat( 168 m_log.ErrorFormat(
169 "[PRIMINVENTORY]: " + 169 "[PRIM INVENTORY]: " +
170 "Couldn't find part {0} in object group {1}, {2} to request inventory data", 170 "Couldn't find part {0} in object group {1}, {2} to request inventory data",
171 localID, Name, UUID); 171 localID, Name, UUID);
172 } 172 }
@@ -212,7 +212,7 @@ namespace OpenSim.Region.Environment.Scenes
212 else 212 else
213 { 213 {
214 m_log.ErrorFormat( 214 m_log.ErrorFormat(
215 "[PRIMINVENTORY]: " + 215 "[PRIM INVENTORY]: " +
216 "Couldn't find prim local ID {0} in group {1}, {2} to add inventory item ID {3}", 216 "Couldn't find prim local ID {0} in group {1}, {2} to add inventory item ID {3}",
217 localID, Name, UUID, newItemId); 217 localID, Name, UUID, newItemId);
218 } 218 }
@@ -236,7 +236,7 @@ namespace OpenSim.Region.Environment.Scenes
236 else 236 else
237 { 237 {
238 m_log.ErrorFormat( 238 m_log.ErrorFormat(
239 "[PRIMINVENTORY]: " + 239 "[PRIM INVENTORY]: " +
240 "Couldn't find prim local ID {0} in prim {1}, {2} to get inventory item ID {3}", 240 "Couldn't find prim local ID {0} in prim {1}, {2} to get inventory item ID {3}",
241 primID, part.Name, part.UUID, itemID); 241 primID, part.Name, part.UUID, itemID);
242 } 242 }
@@ -262,7 +262,7 @@ namespace OpenSim.Region.Environment.Scenes
262 else 262 else
263 { 263 {
264 m_log.ErrorFormat( 264 m_log.ErrorFormat(
265 "[PRIMINVENTORY]: " + 265 "[PRIM INVENTORY]: " +
266 "Couldn't find prim ID {0} to update item {1}, {2}", 266 "Couldn't find prim ID {0} to update item {1}, {2}",
267 item.ParentPartID, item.Name, item.ItemID); 267 item.ParentPartID, item.Name, item.ItemID);
268 } 268 }
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
index 0215cec..1dbac52 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
@@ -184,7 +184,7 @@ namespace OpenSim.Region.Environment.Scenes
184 public void StartScript(TaskInventoryItem item) 184 public void StartScript(TaskInventoryItem item)
185 { 185 {
186 // m_log.InfoFormat( 186 // m_log.InfoFormat(
187 // "[PRIMINVENTORY]: " + 187 // "[PRIM INVENTORY]: " +
188 // "Starting script {0}, {1} in prim {2}, {3}", 188 // "Starting script {0}, {1} in prim {2}, {3}",
189 // item.Name, item.ItemID, Name, UUID); 189 // item.Name, item.ItemID, Name, UUID);
190 AddFlag(LLObject.ObjectFlags.Scripted); 190 AddFlag(LLObject.ObjectFlags.Scripted);
@@ -198,7 +198,7 @@ namespace OpenSim.Region.Environment.Scenes
198 if (null == asset) 198 if (null == asset)
199 { 199 {
200 m_log.ErrorFormat( 200 m_log.ErrorFormat(
201 "[PRIMINVENTORY]: " + 201 "[PRIM INVENTORY]: " +
202 "Couldn't start script {0}, {1} since asset ID {2} could not be found", 202 "Couldn't start script {0}, {1} since asset ID {2} could not be found",
203 item.Name, item.ItemID, item.AssetID); 203 item.Name, item.ItemID, item.AssetID);
204 } 204 }
@@ -231,7 +231,7 @@ namespace OpenSim.Region.Environment.Scenes
231 else 231 else
232 { 232 {
233 m_log.ErrorFormat( 233 m_log.ErrorFormat(
234 "[PRIMINVENTORY]: " + 234 "[PRIM INVENTORY]: " +
235 "Couldn't start script with ID {0} since it couldn't be found for prim {1}, {2}", 235 "Couldn't start script with ID {0} since it couldn't be found for prim {1}, {2}",
236 itemId, Name, UUID); 236 itemId, Name, UUID);
237 } 237 }
@@ -252,7 +252,7 @@ namespace OpenSim.Region.Environment.Scenes
252 else 252 else
253 { 253 {
254 m_log.ErrorFormat( 254 m_log.ErrorFormat(
255 "[PRIMINVENTORY]: " + 255 "[PRIM INVENTORY]: " +
256 "Couldn't stop script with ID {0} since it couldn't be found for prim {1}, {2}", 256 "Couldn't stop script with ID {0} since it couldn't be found for prim {1}, {2}",
257 itemId, Name, UUID); 257 itemId, Name, UUID);
258 } 258 }
@@ -385,7 +385,7 @@ namespace OpenSim.Region.Environment.Scenes
385 else 385 else
386 { 386 {
387 m_log.ErrorFormat( 387 m_log.ErrorFormat(
388 "[PRIMINVENTORY]: " + 388 "[PRIM INVENTORY]: " +
389 "Tried to retrieve item ID {0} from prim {1}, {2} but the item does not exist in this inventory", 389 "Tried to retrieve item ID {0} from prim {1}, {2} but the item does not exist in this inventory",
390 item.ItemID, Name, UUID); 390 item.ItemID, Name, UUID);
391 } 391 }