aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Scene.Inventory.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.Inventory.cs76
1 files changed, 38 insertions, 38 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index 28760fd..cc9d294 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -83,8 +83,8 @@ namespace OpenSim.Region.Environment.Scenes
83 83
84 if (!TryGetAvatar(avatarId, out avatar)) 84 if (!TryGetAvatar(avatarId, out avatar))
85 { 85 {
86 m_log.Error(String.Format( 86 m_log.ErrorFormat(
87 "[AGENTINVENTORY]: Could not find avatar {0} to add inventory item", avatarId)); 87 "[AGENTINVENTORY]: Could not find avatar {0} to add inventory item", avatarId);
88 return; 88 return;
89 } 89 }
90 90
@@ -146,10 +146,10 @@ namespace OpenSim.Region.Environment.Scenes
146 } 146 }
147 else 147 else
148 { 148 {
149 m_log.Error(String.Format( 149 m_log.ErrorFormat(
150 "[AGENTINVENTORY]: " + 150 "[AGENTINVENTORY]: " +
151 "Avatar {0} cannot be found to update its inventory item asset", 151 "Avatar {0} cannot be found to update its inventory item asset",
152 avatarId)); 152 avatarId);
153 } 153 }
154 154
155 return LLUUID.Zero; 155 return LLUUID.Zero;
@@ -171,10 +171,10 @@ namespace OpenSim.Region.Environment.Scenes
171 SceneObjectGroup group = part.ParentGroup; 171 SceneObjectGroup group = part.ParentGroup;
172 if (null == group) 172 if (null == group)
173 { 173 {
174 m_log.Error(String.Format( 174 m_log.ErrorFormat(
175 "[PRIMINVENTORY]: " + 175 "[PRIMINVENTORY]: " +
176 "Prim inventory update requested for item ID {0} in prim ID {1} but this prim does not exist", 176 "Prim inventory update requested for item ID {0} in prim ID {1} but this prim does not exist",
177 itemId, primId)); 177 itemId, primId);
178 178
179 return; 179 return;
180 } 180 }
@@ -220,10 +220,10 @@ namespace OpenSim.Region.Environment.Scenes
220 } 220 }
221 else 221 else
222 { 222 {
223 m_log.Error(String.Format( 223 m_log.ErrorFormat(
224 "[PRIMINVENTORY]: " + 224 "[PRIMINVENTORY]: " +
225 "Avatar {0} cannot be found to update its prim item asset", 225 "Avatar {0} cannot be found to update its prim item asset",
226 avatarId)); 226 avatarId);
227 } 227 }
228 } 228 }
229 229
@@ -498,8 +498,8 @@ namespace OpenSim.Region.Environment.Scenes
498 } 498 }
499 else 499 else
500 { 500 {
501 m_log.Error(String.Format( 501 m_log.ErrorFormat(
502 "[PRIMINVENTORY]: Inventory requested of prim {0} which doesn't exist", primLocalID)); 502 "[PRIMINVENTORY]: Inventory requested of prim {0} which doesn't exist", primLocalID);
503 } 503 }
504 } 504 }
505 505
@@ -524,11 +524,11 @@ namespace OpenSim.Region.Environment.Scenes
524 } 524 }
525 else 525 else
526 { 526 {
527 m_log.Error(String.Format( 527 m_log.ErrorFormat(
528 "[PRIMINVENTORY]: " + 528 "[PRIMINVENTORY]: " +
529 "Removal of item {0} requested of prim {1} but this prim does not exist", 529 "Removal of item {0} requested of prim {1} but this prim does not exist",
530 itemID, 530 itemID,
531 localID)); 531 localID);
532 } 532 }
533 } 533 }
534 534
@@ -548,18 +548,18 @@ namespace OpenSim.Region.Environment.Scenes
548 { 548 {
549 // TODO Retrieve itemID from client's inventory to pass on 549 // TODO Retrieve itemID from client's inventory to pass on
550 //group.AddInventoryItem(remoteClient, primLocalID, null); 550 //group.AddInventoryItem(remoteClient, primLocalID, null);
551 m_log.Info(String.Format( 551 m_log.InfoFormat(
552 "[PRIMINVENTORY]: " + 552 "[PRIMINVENTORY]: " +
553 "Non script prim inventory not yet implemented!" 553 "Non script prim inventory not yet implemented!"
554 + "\nUpdateTaskInventory called with item {0}, folder {1}, primLocalID {2}, user {3}", 554 + "\nUpdateTaskInventory called with item {0}, folder {1}, primLocalID {2}, user {3}",
555 itemID, folderID, primLocalID, remoteClient.Name)); 555 itemID, folderID, primLocalID, remoteClient.Name);
556 } 556 }
557 else 557 else
558 { 558 {
559 m_log.Warn(String.Format( 559 m_log.WarnFormat(
560 "[PRIMINVENTORY]: " + 560 "[PRIMINVENTORY]: " +
561 "Update with item {0} requested of prim {1} for {2} but this prim does not exist", 561 "Update with item {0} requested of prim {1} for {2} but this prim does not exist",
562 itemID, primLocalID, remoteClient.Name)); 562 itemID, primLocalID, remoteClient.Name);
563 } 563 }
564 } 564 }
565 565
@@ -604,18 +604,18 @@ namespace OpenSim.Region.Environment.Scenes
604 } 604 }
605 else 605 else
606 { 606 {
607 m_log.Error(String.Format( 607 m_log.ErrorFormat(
608 "[PRIMINVENTORY]: " + 608 "[PRIMINVENTORY]: " +
609 "Could not rez script {0} into prim local ID {1} for user {2}" 609 "Could not rez script {0} into prim local ID {1} for user {2}"
610 + " because the prim could not be found in the region!", 610 + " because the prim could not be found in the region!",
611 item.inventoryName, localID, remoteClient.Name)); 611 item.inventoryName, localID, remoteClient.Name);
612 } 612 }
613 } 613 }
614 else 614 else
615 { 615 {
616 m_log.Error(String.Format( 616 m_log.ErrorFormat(
617 "[PRIMINVENTORY]: Could not find script inventory item {0} to rez for {1}!", 617 "[PRIMINVENTORY]: Could not find script inventory item {0} to rez for {1}!",
618 itemID, remoteClient.Name)); 618 itemID, remoteClient.Name);
619 } 619 }
620 } 620 }
621 } 621 }