aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-05-23 02:05:48 +0100
committerJustin Clark-Casey (justincc)2012-05-23 02:05:48 +0100
commitec8745cf511de3a452a882a44034c55baf2350a1 (patch)
tree5d6b9dad6dc5b08ef843be46c66ed6f3f98c9b4f /OpenSim/Region
parentFix bug where an avatar that had an object they owned attached through llAtta... (diff)
downloadopensim-SC_OLD-ec8745cf511de3a452a882a44034c55baf2350a1.zip
opensim-SC_OLD-ec8745cf511de3a452a882a44034c55baf2350a1.tar.gz
opensim-SC_OLD-ec8745cf511de3a452a882a44034c55baf2350a1.tar.bz2
opensim-SC_OLD-ec8745cf511de3a452a882a44034c55baf2350a1.tar.xz
minor: Make log class names in InventoryAccessModule uniform
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs20
1 files changed, 10 insertions, 10 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
index f219d4c..69767c1 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
@@ -175,7 +175,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
175 sbyte assetType, 175 sbyte assetType,
176 byte wearableType, uint nextOwnerMask, int creationDate) 176 byte wearableType, uint nextOwnerMask, int creationDate)
177 { 177 {
178 m_log.DebugFormat("[AGENT INVENTORY]: Received request to create inventory item {0} in folder {1}", name, folderID); 178 m_log.DebugFormat("[INVENTORY ACCESS MODULE]: Received request to create inventory item {0} in folder {1}", name, folderID);
179 179
180 if (!m_Scene.Permissions.CanCreateUserInventory(invType, remoteClient.AgentId)) 180 if (!m_Scene.Permissions.CanCreateUserInventory(invType, remoteClient.AgentId))
181 return; 181 return;
@@ -210,7 +210,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
210 else 210 else
211 { 211 {
212 m_log.ErrorFormat( 212 m_log.ErrorFormat(
213 "ScenePresence for agent uuid {0} unexpectedly not found in CreateNewInventoryItem", 213 "[INVENTORY ACCESS MODULE]: ScenePresence for agent uuid {0} unexpectedly not found in CreateNewInventoryItem",
214 remoteClient.AgentId); 214 remoteClient.AgentId);
215 } 215 }
216 } 216 }
@@ -288,7 +288,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
288 else 288 else
289 { 289 {
290 m_log.ErrorFormat( 290 m_log.ErrorFormat(
291 "[AGENT INVENTORY]: Could not find item {0} for caps inventory update", 291 "[INVENTORY ACCESS MODULE]: Could not find item {0} for caps inventory update",
292 itemID); 292 itemID);
293 } 293 }
294 294
@@ -605,7 +605,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
605 if (null == item) 605 if (null == item)
606 { 606 {
607 m_log.DebugFormat( 607 m_log.DebugFormat(
608 "[AGENT INVENTORY]: Object {0} {1} scheduled for save to inventory has already been deleted.", 608 "[INVENTORY ACCESS MODULE]: Object {0} {1} scheduled for save to inventory has already been deleted.",
609 so.Name, so.UUID); 609 so.Name, so.UUID);
610 610
611 return null; 611 return null;
@@ -706,7 +706,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
706 if (item == null) 706 if (item == null)
707 { 707 {
708 m_log.WarnFormat( 708 m_log.WarnFormat(
709 "[InventoryAccessModule]: Could not find item {0} for {1} in RezObject()", 709 "[INVENTORY ACCESS MODULE]: Could not find item {0} for {1} in RezObject()",
710 itemID, remoteClient.Name); 710 itemID, remoteClient.Name);
711 711
712 return null; 712 return null;
@@ -738,7 +738,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
738 else 738 else
739 { 739 {
740 m_log.WarnFormat( 740 m_log.WarnFormat(
741 "[InventoryAccessModule]: Could not find asset {0} for {1} in RezObject()", 741 "[INVENTORY ACCESS MODULE]: Could not find asset {0} for {1} in RezObject()",
742 assetID, remoteClient.Name); 742 assetID, remoteClient.Name);
743 } 743 }
744 744
@@ -815,7 +815,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
815 group = objlist[i]; 815 group = objlist[i];
816 816
817// m_log.DebugFormat( 817// m_log.DebugFormat(
818// "[InventoryAccessModule]: Preparing to rez {0} {1} {2} ownermask={3:X} nextownermask={4:X} groupmask={5:X} everyonemask={6:X} for {7}", 818// "[INVENTORY ACCESS MODULE]: Preparing to rez {0} {1} {2} ownermask={3:X} nextownermask={4:X} groupmask={5:X} everyonemask={6:X} for {7}",
819// group.Name, group.LocalId, group.UUID, 819// group.Name, group.LocalId, group.UUID,
820// group.RootPart.OwnerMask, group.RootPart.NextOwnerMask, group.RootPart.GroupMask, group.RootPart.EveryoneMask, 820// group.RootPart.OwnerMask, group.RootPart.NextOwnerMask, group.RootPart.GroupMask, group.RootPart.EveryoneMask,
821// remoteClient.Name); 821// remoteClient.Name);
@@ -823,7 +823,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
823// Vector3 storedPosition = group.AbsolutePosition; 823// Vector3 storedPosition = group.AbsolutePosition;
824 if (group.UUID == UUID.Zero) 824 if (group.UUID == UUID.Zero)
825 { 825 {
826 m_log.Debug("[InventoryAccessModule]: Object has UUID.Zero! Position 3"); 826 m_log.Debug("[INVENTORY ACCESS MODULE]: Object has UUID.Zero! Position 3");
827 } 827 }
828 828
829 foreach (SceneObjectPart part in group.Parts) 829 foreach (SceneObjectPart part in group.Parts)
@@ -886,7 +886,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
886 } 886 }
887 887
888// m_log.DebugFormat( 888// m_log.DebugFormat(
889// "[InventoryAccessModule]: Rezzed {0} {1} {2} ownermask={3:X} nextownermask={4:X} groupmask={5:X} everyonemask={6:X} for {7}", 889// "[INVENTORY ACCESS MODULE]: Rezzed {0} {1} {2} ownermask={3:X} nextownermask={4:X} groupmask={5:X} everyonemask={6:X} for {7}",
890// group.Name, group.LocalId, group.UUID, 890// group.Name, group.LocalId, group.UUID,
891// group.RootPart.OwnerMask, group.RootPart.NextOwnerMask, group.RootPart.GroupMask, group.RootPart.EveryoneMask, 891// group.RootPart.OwnerMask, group.RootPart.NextOwnerMask, group.RootPart.GroupMask, group.RootPart.EveryoneMask,
892// remoteClient.Name); 892// remoteClient.Name);
@@ -1101,7 +1101,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
1101 if (assetRequestItem.AssetID != requestID) 1101 if (assetRequestItem.AssetID != requestID)
1102 { 1102 {
1103 m_log.WarnFormat( 1103 m_log.WarnFormat(
1104 "[CLIENT]: {0} requested asset {1} from item {2} but this does not match item's asset {3}", 1104 "[INVENTORY ACCESS MODULE]: {0} requested asset {1} from item {2} but this does not match item's asset {3}",
1105 Name, requestID, itemID, assetRequestItem.AssetID); 1105 Name, requestID, itemID, assetRequestItem.AssetID);
1106 1106
1107 return false; 1107 return false;