diff options
| author | unknown | 2009-12-07 18:14:02 +0100 |
|---|---|---|
| committer | unknown | 2009-12-07 18:14:02 +0100 |
| commit | dbd8c400ce9eb9177bb9d0b939405578ad9c3157 (patch) | |
| tree | 61daf67c74c14ad10147a115f7ef673c73968840 /OpenSim/Framework/Communications/Services/LoginService.cs | |
| parent | Initial windlight codebase commit (diff) | |
| parent | Same for the remote auth connector (diff) | |
| download | opensim-SC_OLD-dbd8c400ce9eb9177bb9d0b939405578ad9c3157.zip opensim-SC_OLD-dbd8c400ce9eb9177bb9d0b939405578ad9c3157.tar.gz opensim-SC_OLD-dbd8c400ce9eb9177bb9d0b939405578ad9c3157.tar.bz2 opensim-SC_OLD-dbd8c400ce9eb9177bb9d0b939405578ad9c3157.tar.xz | |
Merge branch 'careminster' into windlight
Diffstat (limited to 'OpenSim/Framework/Communications/Services/LoginService.cs')
| -rw-r--r-- | OpenSim/Framework/Communications/Services/LoginService.cs | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/OpenSim/Framework/Communications/Services/LoginService.cs b/OpenSim/Framework/Communications/Services/LoginService.cs index b652299..57ca704 100644 --- a/OpenSim/Framework/Communications/Services/LoginService.cs +++ b/OpenSim/Framework/Communications/Services/LoginService.cs | |||
| @@ -244,7 +244,6 @@ namespace OpenSim.Framework.Communications.Services | |||
| 244 | InventoryRootHash["folder_id"] = inventData.RootFolderID.ToString(); | 244 | InventoryRootHash["folder_id"] = inventData.RootFolderID.ToString(); |
| 245 | ArrayList InventoryRoot = new ArrayList(); | 245 | ArrayList InventoryRoot = new ArrayList(); |
| 246 | InventoryRoot.Add(InventoryRootHash); | 246 | InventoryRoot.Add(InventoryRootHash); |
| 247 | userProfile.RootInventoryFolderID = inventData.RootFolderID; | ||
| 248 | 247 | ||
| 249 | logResponse.InventoryRoot = InventoryRoot; | 248 | logResponse.InventoryRoot = InventoryRoot; |
| 250 | logResponse.InventorySkeleton = AgentInventoryArray; | 249 | logResponse.InventorySkeleton = AgentInventoryArray; |
| @@ -501,7 +500,6 @@ namespace OpenSim.Framework.Communications.Services | |||
| 501 | InventoryRootHash["folder_id"] = inventData.RootFolderID.ToString(); | 500 | InventoryRootHash["folder_id"] = inventData.RootFolderID.ToString(); |
| 502 | ArrayList InventoryRoot = new ArrayList(); | 501 | ArrayList InventoryRoot = new ArrayList(); |
| 503 | InventoryRoot.Add(InventoryRootHash); | 502 | InventoryRoot.Add(InventoryRootHash); |
| 504 | userProfile.RootInventoryFolderID = inventData.RootFolderID; | ||
| 505 | 503 | ||
| 506 | 504 | ||
| 507 | // Inventory Library Section | 505 | // Inventory Library Section |