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/UserServer/UserLoginService.cs | |
parent | *Added event called after any movement is handled (OnClientMovement) - will b... (diff) | |
download | opensim-SC-be2ad79e52efb5eb543057e8e73fa601d0b91c87.zip opensim-SC-be2ad79e52efb5eb543057e8e73fa601d0b91c87.tar.gz opensim-SC-be2ad79e52efb5eb543057e8e73fa601d0b91c87.tar.bz2 opensim-SC-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/UserServer/UserLoginService.cs')
-rw-r--r-- | OpenSim/Grid/UserServer/UserLoginService.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs index c5c0d02..9b9360d 100644 --- a/OpenSim/Grid/UserServer/UserLoginService.cs +++ b/OpenSim/Grid/UserServer/UserLoginService.cs | |||
@@ -246,10 +246,10 @@ namespace OpenSim.Grid.UserServer | |||
246 | } | 246 | } |
247 | TempHash = new Hashtable(); | 247 | TempHash = new Hashtable(); |
248 | TempHash["name"] = InvFolder.name; | 248 | TempHash["name"] = InvFolder.name; |
249 | TempHash["parent_id"] = InvFolder.parentID.ToStringHyphenated(); | 249 | TempHash["parent_id"] = InvFolder.parentID.ToString(); |
250 | TempHash["version"] = (Int32)InvFolder.version; | 250 | TempHash["version"] = (Int32)InvFolder.version; |
251 | TempHash["type_default"] = (Int32)InvFolder.type; | 251 | TempHash["type_default"] = (Int32)InvFolder.type; |
252 | TempHash["folder_id"] = InvFolder.folderID.ToStringHyphenated(); | 252 | TempHash["folder_id"] = InvFolder.folderID.ToString(); |
253 | AgentInventoryArray.Add(TempHash); | 253 | AgentInventoryArray.Add(TempHash); |
254 | } | 254 | } |
255 | return new InventoryData(AgentInventoryArray, rootID); | 255 | return new InventoryData(AgentInventoryArray, rootID); |
@@ -268,10 +268,10 @@ namespace OpenSim.Grid.UserServer | |||
268 | { | 268 | { |
269 | TempHash = new Hashtable(); | 269 | TempHash = new Hashtable(); |
270 | TempHash["name"] = InvFolder.FolderName; | 270 | TempHash["name"] = InvFolder.FolderName; |
271 | TempHash["parent_id"] = InvFolder.ParentID.ToStringHyphenated(); | 271 | TempHash["parent_id"] = InvFolder.ParentID.ToString(); |
272 | TempHash["version"] = (Int32)InvFolder.Version; | 272 | TempHash["version"] = (Int32)InvFolder.Version; |
273 | TempHash["type_default"] = (Int32)InvFolder.DefaultType; | 273 | TempHash["type_default"] = (Int32)InvFolder.DefaultType; |
274 | TempHash["folder_id"] = InvFolder.FolderID.ToStringHyphenated(); | 274 | TempHash["folder_id"] = InvFolder.FolderID.ToString(); |
275 | AgentInventoryArray.Add(TempHash); | 275 | AgentInventoryArray.Add(TempHash); |
276 | } | 276 | } |
277 | 277 | ||