diff options
author | Jeff Ames | 2007-12-20 05:43:02 +0000 |
---|---|---|
committer | Jeff Ames | 2007-12-20 05:43:02 +0000 |
commit | be2ad79e52efb5eb543057e8e73fa601d0b91c87 (patch) | |
tree | 688a11b5737835b3cd46b2beaf01c6e9d23ace09 /OpenSim/Grid/InventoryServer | |
parent | *Added event called after any movement is handled (OnClientMovement) - will b... (diff) | |
download | opensim-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 '')
-rw-r--r-- | OpenSim/Grid/InventoryServer/GridInventoryService.cs | 12 | ||||
-rw-r--r-- | OpenSim/Grid/InventoryServer/InventoryManager.cs | 4 |
2 files changed, 8 insertions, 8 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); |
diff --git a/OpenSim/Grid/InventoryServer/InventoryManager.cs b/OpenSim/Grid/InventoryServer/InventoryManager.cs index f3a45c6..1070bcf 100644 --- a/OpenSim/Grid/InventoryServer/InventoryManager.cs +++ b/OpenSim/Grid/InventoryServer/InventoryManager.cs | |||
@@ -164,13 +164,13 @@ namespace OpenSim.Grid.InventoryServer | |||
164 | 164 | ||
165 | private byte[] GetUserInventory(LLUUID userID) | 165 | private byte[] GetUserInventory(LLUUID userID) |
166 | { | 166 | { |
167 | MainLog.Instance.Notice(OpenInventory_Main.LogName, "Getting Inventory for user {0}", userID.ToStringHyphenated()); | 167 | MainLog.Instance.Notice(OpenInventory_Main.LogName, "Getting Inventory for user {0}", userID.ToString()); |
168 | byte[] result = new byte[] { }; | 168 | byte[] result = new byte[] { }; |
169 | 169 | ||
170 | InventoryFolderBase fb = _manager._databasePlugin.getUserRootFolder(userID); | 170 | InventoryFolderBase fb = _manager._databasePlugin.getUserRootFolder(userID); |
171 | if (fb == null) | 171 | if (fb == null) |
172 | { | 172 | { |
173 | MainLog.Instance.Notice(OpenInventory_Main.LogName, "Inventory not found for user {0}, creating new", userID.ToStringHyphenated()); | 173 | MainLog.Instance.Notice(OpenInventory_Main.LogName, "Inventory not found for user {0}, creating new", userID.ToString()); |
174 | CreateDefaultInventory(userID); | 174 | CreateDefaultInventory(userID); |
175 | } | 175 | } |
176 | 176 | ||