diff options
Diffstat (limited to 'OpenSim/Grid/InventoryServer/GridInventoryService.cs')
-rw-r--r-- | OpenSim/Grid/InventoryServer/GridInventoryService.cs | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/OpenSim/Grid/InventoryServer/GridInventoryService.cs b/OpenSim/Grid/InventoryServer/GridInventoryService.cs index d36a915..a719452 100644 --- a/OpenSim/Grid/InventoryServer/GridInventoryService.cs +++ b/OpenSim/Grid/InventoryServer/GridInventoryService.cs | |||
@@ -37,6 +37,8 @@ namespace OpenSim.Grid.InventoryServer | |||
37 | { | 37 | { |
38 | public class GridInventoryService : InventoryServiceBase | 38 | public class GridInventoryService : InventoryServiceBase |
39 | { | 39 | { |
40 | private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | ||
41 | |||
40 | public override void RequestInventoryForUser(LLUUID userID, InventoryFolderInfo folderCallBack, | 42 | public override void RequestInventoryForUser(LLUUID userID, InventoryFolderInfo folderCallBack, |
41 | InventoryItemInfo itemCallBack) | 43 | InventoryItemInfo itemCallBack) |
42 | { | 44 | { |
@@ -108,7 +110,7 @@ namespace OpenSim.Grid.InventoryServer | |||
108 | LLUUID userID = new LLUUID(rawUserID); | 110 | LLUUID userID = new LLUUID(rawUserID); |
109 | 111 | ||
110 | // We get enough verbose messages later on for diagnostics | 112 | // We get enough verbose messages later on for diagnostics |
111 | //MainLog.Instance.Verbose("INVENTORY", "Request for inventory for " + userID.ToString()); | 113 | //m_log.Info("[INVENTORY]: Request for inventory for " + userID.ToString()); |
112 | 114 | ||
113 | InventoryCollection invCollection = new InventoryCollection(); | 115 | InventoryCollection invCollection = new InventoryCollection(); |
114 | List<InventoryFolderBase> folders; | 116 | List<InventoryFolderBase> folders; |
@@ -126,8 +128,8 @@ namespace OpenSim.Grid.InventoryServer | |||
126 | { | 128 | { |
127 | LLUUID userID = new LLUUID(rawUserID); | 129 | LLUUID userID = new LLUUID(rawUserID); |
128 | 130 | ||
129 | MainLog.Instance.Verbose( | 131 | m_log.Info( |
130 | "INVENTORY", "Creating new set of inventory folders for " + userID.ToString()); | 132 | "[INVENTORY]: Creating new set of inventory folders for " + userID.ToString()); |
131 | 133 | ||
132 | CreateNewUserInventory(userID); | 134 | CreateNewUserInventory(userID); |
133 | return true; | 135 | return true; |
@@ -152,8 +154,8 @@ namespace OpenSim.Grid.InventoryServer | |||
152 | public bool AddInventoryFolder(InventoryFolderBase folder) | 154 | public bool AddInventoryFolder(InventoryFolderBase folder) |
153 | { | 155 | { |
154 | // Right now, this actions act more like an update/insert combination than a simple create. | 156 | // Right now, this actions act more like an update/insert combination than a simple create. |
155 | MainLog.Instance.Verbose( | 157 | m_log.Info( |
156 | "INVENTORY", | 158 | "[INVENTORY]: " + |
157 | "Updating in " + folder.parentID.ToString() | 159 | "Updating in " + folder.parentID.ToString() |
158 | + ", folder " + folder.name); | 160 | + ", folder " + folder.name); |
159 | 161 | ||
@@ -163,8 +165,8 @@ namespace OpenSim.Grid.InventoryServer | |||
163 | 165 | ||
164 | public bool MoveInventoryFolder(InventoryFolderBase folder) | 166 | public bool MoveInventoryFolder(InventoryFolderBase folder) |
165 | { | 167 | { |
166 | MainLog.Instance.Verbose( | 168 | m_log.Info( |
167 | "INVENTORY", | 169 | "[INVENTORY]: " + |
168 | "Moving folder " + folder.folderID | 170 | "Moving folder " + folder.folderID |
169 | + " to " + folder.parentID.ToString()); | 171 | + " to " + folder.parentID.ToString()); |
170 | 172 | ||
@@ -175,8 +177,8 @@ namespace OpenSim.Grid.InventoryServer | |||
175 | public bool AddInventoryItem(InventoryItemBase item) | 177 | public bool AddInventoryItem(InventoryItemBase item) |
176 | { | 178 | { |
177 | // Right now, this actions act more like an update/insert combination than a simple create. | 179 | // Right now, this actions act more like an update/insert combination than a simple create. |
178 | MainLog.Instance.Verbose( | 180 | m_log.Info( |
179 | "INVENTORY", | 181 | "[INVENTORY]: " + |
180 | "Updating in " + item.parentFolderID.ToString() | 182 | "Updating in " + item.parentFolderID.ToString() |
181 | + ", item " + item.inventoryName); | 183 | + ", item " + item.inventoryName); |
182 | 184 | ||
@@ -187,8 +189,8 @@ namespace OpenSim.Grid.InventoryServer | |||
187 | public override void DeleteInventoryItem(LLUUID userID, InventoryItemBase item) | 189 | public override void DeleteInventoryItem(LLUUID userID, InventoryItemBase item) |
188 | { | 190 | { |
189 | // extra spaces to align with other inventory messages | 191 | // extra spaces to align with other inventory messages |
190 | MainLog.Instance.Verbose( | 192 | m_log.Info( |
191 | "INVENTORY", | 193 | "[INVENTORY]: " + |
192 | "Deleting in " + item.parentFolderID.ToString() | 194 | "Deleting in " + item.parentFolderID.ToString() |
193 | + ", item " + item.inventoryName); | 195 | + ", item " + item.inventoryName); |
194 | 196 | ||