aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Communications/LoginService.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/Framework/Communications/LoginService.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/Framework/Communications/LoginService.cs')
-rw-r--r--OpenSim/Framework/Communications/LoginService.cs16
1 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Framework/Communications/LoginService.cs b/OpenSim/Framework/Communications/LoginService.cs
index 7012602..58dab9b 100644
--- a/OpenSim/Framework/Communications/LoginService.cs
+++ b/OpenSim/Framework/Communications/LoginService.cs
@@ -126,7 +126,7 @@ namespace OpenSim.Framework.UserManagement
126 ArrayList AgentInventoryArray = inventData.InventoryArray; 126 ArrayList AgentInventoryArray = inventData.InventoryArray;
127 127
128 Hashtable InventoryRootHash = new Hashtable(); 128 Hashtable InventoryRootHash = new Hashtable();
129 InventoryRootHash["folder_id"] = inventData.RootFolderID.ToStringHyphenated(); 129 InventoryRootHash["folder_id"] = inventData.RootFolderID.ToString();
130 ArrayList InventoryRoot = new ArrayList(); 130 ArrayList InventoryRoot = new ArrayList();
131 InventoryRoot.Add(InventoryRootHash); 131 InventoryRoot.Add(InventoryRootHash);
132 userProfile.rootInventoryFolderID = inventData.RootFolderID; 132 userProfile.rootInventoryFolderID = inventData.RootFolderID;
@@ -136,9 +136,9 @@ namespace OpenSim.Framework.UserManagement
136 136
137 logResponse.Lastname = userProfile.surname; 137 logResponse.Lastname = userProfile.surname;
138 logResponse.Firstname = userProfile.username; 138 logResponse.Firstname = userProfile.username;
139 logResponse.AgentID = agentID.ToStringHyphenated(); 139 logResponse.AgentID = agentID.ToString();
140 logResponse.SessionID = userProfile.currentAgent.sessionID.ToStringHyphenated(); 140 logResponse.SessionID = userProfile.currentAgent.sessionID.ToString();
141 logResponse.SecureSessionID = userProfile.currentAgent.secureSessionID.ToStringHyphenated(); 141 logResponse.SecureSessionID = userProfile.currentAgent.secureSessionID.ToString();
142 logResponse.InventoryRoot = InventoryRoot; 142 logResponse.InventoryRoot = InventoryRoot;
143 logResponse.InventorySkeleton = AgentInventoryArray; 143 logResponse.InventorySkeleton = AgentInventoryArray;
144 logResponse.InventoryLibrary = GetInventoryLibrary(); 144 logResponse.InventoryLibrary = GetInventoryLibrary();
@@ -263,7 +263,7 @@ namespace OpenSim.Framework.UserManagement
263 //return new ArrayList(); 263 //return new ArrayList();
264 Hashtable TempHash = new Hashtable(); 264 Hashtable TempHash = new Hashtable();
265 TempHash["name"] = "OpenSim Library"; 265 TempHash["name"] = "OpenSim Library";
266 TempHash["parent_id"] = LLUUID.Zero.ToStringHyphenated(); 266 TempHash["parent_id"] = LLUUID.Zero.ToString();
267 TempHash["version"] = 1; 267 TempHash["version"] = 1;
268 TempHash["type_default"] = -1; 268 TempHash["type_default"] = -1;
269 TempHash["folder_id"] = "00000112-000f-0000-0000-000100bba000"; 269 TempHash["folder_id"] = "00000112-000f-0000-0000-000100bba000";
@@ -305,10 +305,10 @@ namespace OpenSim.Framework.UserManagement
305 { 305 {
306 TempHash = new Hashtable(); 306 TempHash = new Hashtable();
307 TempHash["name"] = InvFolder.FolderName; 307 TempHash["name"] = InvFolder.FolderName;
308 TempHash["parent_id"] = InvFolder.ParentID.ToStringHyphenated(); 308 TempHash["parent_id"] = InvFolder.ParentID.ToString();
309 TempHash["version"] = (Int32) InvFolder.Version; 309 TempHash["version"] = (Int32) InvFolder.Version;
310 TempHash["type_default"] = (Int32) InvFolder.DefaultType; 310 TempHash["type_default"] = (Int32) InvFolder.DefaultType;
311 TempHash["folder_id"] = InvFolder.FolderID.ToStringHyphenated(); 311 TempHash["folder_id"] = InvFolder.FolderID.ToString();
312 AgentInventoryArray.Add(TempHash); 312 AgentInventoryArray.Add(TempHash);
313 } 313 }
314 314
@@ -327,4 +327,4 @@ namespace OpenSim.Framework.UserManagement
327 } 327 }
328 } 328 }
329 } 329 }
330} \ No newline at end of file 330}