aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid/InventoryServer/GridInventoryService.cs
diff options
context:
space:
mode:
authorJeff Ames2007-12-20 05:43:02 +0000
committerJeff Ames2007-12-20 05:43:02 +0000
commitbe2ad79e52efb5eb543057e8e73fa601d0b91c87 (patch)
tree688a11b5737835b3cd46b2beaf01c6e9d23ace09 /OpenSim/Grid/InventoryServer/GridInventoryService.cs
parent*Added event called after any movement is handled (OnClientMovement) - will b... (diff)
downloadopensim-SC_OLD-be2ad79e52efb5eb543057e8e73fa601d0b91c87.zip
opensim-SC_OLD-be2ad79e52efb5eb543057e8e73fa601d0b91c87.tar.gz
opensim-SC_OLD-be2ad79e52efb5eb543057e8e73fa601d0b91c87.tar.bz2
opensim-SC_OLD-be2ad79e52efb5eb543057e8e73fa601d0b91c87.tar.xz
Added patch from Johan. First attempt to solve the LibSL.Packet GC problem. Works with LibSL rev>1532
Diffstat (limited to 'OpenSim/Grid/InventoryServer/GridInventoryService.cs')
-rw-r--r--OpenSim/Grid/InventoryServer/GridInventoryService.cs12
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Grid/InventoryServer/GridInventoryService.cs b/OpenSim/Grid/InventoryServer/GridInventoryService.cs
index 150a262..04d4131 100644
--- a/OpenSim/Grid/InventoryServer/GridInventoryService.cs
+++ b/OpenSim/Grid/InventoryServer/GridInventoryService.cs
@@ -108,7 +108,7 @@ namespace OpenSim.Grid.InventoryServer
108 { 108 {
109 LLUUID userID = new LLUUID(rawUserID); 109 LLUUID userID = new LLUUID(rawUserID);
110 110
111 MainLog.Instance.Verbose("INVENTORY", "Request for inventory for " + userID.ToStringHyphenated()); 111 MainLog.Instance.Verbose("INVENTORY", "Request for inventory for " + userID.ToString());
112 112
113 InventoryCollection invCollection = new InventoryCollection(); 113 InventoryCollection invCollection = new InventoryCollection();
114 List<InventoryFolderBase> folders; 114 List<InventoryFolderBase> folders;
@@ -127,7 +127,7 @@ namespace OpenSim.Grid.InventoryServer
127 LLUUID userID = new LLUUID(rawUserID); 127 LLUUID userID = new LLUUID(rawUserID);
128 128
129 MainLog.Instance.Verbose( 129 MainLog.Instance.Verbose(
130 "INVENTORY", "Creating new set of inventory folders for " + userID.ToStringHyphenated()); 130 "INVENTORY", "Creating new set of inventory folders for " + userID.ToString());
131 131
132 CreateNewUserInventory(userID); 132 CreateNewUserInventory(userID);
133 return true; 133 return true;
@@ -154,7 +154,7 @@ namespace OpenSim.Grid.InventoryServer
154 // Right now, this actions act more like an update/insert combination than a simple create. 154 // Right now, this actions act more like an update/insert combination than a simple create.
155 MainLog.Instance.Verbose( 155 MainLog.Instance.Verbose(
156 "INVENTORY", 156 "INVENTORY",
157 "Updating in " + folder.parentID.ToStringHyphenated() 157 "Updating in " + folder.parentID.ToString()
158 + ", folder " + folder.name); 158 + ", folder " + folder.name);
159 159
160 AddNewInventoryFolder(folder.agentID, folder); 160 AddNewInventoryFolder(folder.agentID, folder);
@@ -166,7 +166,7 @@ namespace OpenSim.Grid.InventoryServer
166 MainLog.Instance.Verbose( 166 MainLog.Instance.Verbose(
167 "INVENTORY", 167 "INVENTORY",
168 "Moving folder " + folder.folderID 168 "Moving folder " + folder.folderID
169 + " to " + folder.parentID.ToStringHyphenated()); 169 + " to " + folder.parentID.ToString());
170 170
171 MoveExistingInventoryFolder(folder); 171 MoveExistingInventoryFolder(folder);
172 return true; 172 return true;
@@ -177,7 +177,7 @@ namespace OpenSim.Grid.InventoryServer
177 // Right now, this actions act more like an update/insert combination than a simple create. 177 // Right now, this actions act more like an update/insert combination than a simple create.
178 MainLog.Instance.Verbose( 178 MainLog.Instance.Verbose(
179 "INVENTORY", 179 "INVENTORY",
180 "Updating in " + item.parentFolderID.ToStringHyphenated() 180 "Updating in " + item.parentFolderID.ToString()
181 + ", item " + item.inventoryName); 181 + ", item " + item.inventoryName);
182 182
183 AddNewInventoryItem(item.avatarID, item); 183 AddNewInventoryItem(item.avatarID, item);
@@ -189,7 +189,7 @@ namespace OpenSim.Grid.InventoryServer
189 // extra spaces to align with other inventory messages 189 // extra spaces to align with other inventory messages
190 MainLog.Instance.Verbose( 190 MainLog.Instance.Verbose(
191 "INVENTORY", 191 "INVENTORY",
192 "Deleting in " + item.parentFolderID.ToStringHyphenated() 192 "Deleting in " + item.parentFolderID.ToString()
193 + ", item " + item.inventoryName); 193 + ", item " + item.inventoryName);
194 194
195 DeleteItem(item); 195 DeleteItem(item);