diff options
| author | MW | 2007-12-02 13:59:15 +0000 |
|---|---|---|
| committer | MW | 2007-12-02 13:59:15 +0000 |
| commit | 80609c2b1572d9b946675db486fc46e327171cfa (patch) | |
| tree | 85a623c1a75255d74883c3f9ba11e5f66a053a18 /OpenSim/Grid | |
| parent | New Inventory folder should now be stored to the inventory server/database. T... (diff) | |
| download | opensim-SC-80609c2b1572d9b946675db486fc46e327171cfa.zip opensim-SC-80609c2b1572d9b946675db486fc46e327171cfa.tar.gz opensim-SC-80609c2b1572d9b946675db486fc46e327171cfa.tar.bz2 opensim-SC-80609c2b1572d9b946675db486fc46e327171cfa.tar.xz | |
Some refactoring , mainly on Inventory code.
Diffstat (limited to 'OpenSim/Grid')
| -rw-r--r-- | OpenSim/Grid/UserServer/Main.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Grid/UserServer/UserLoginService.cs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs index b00bb76..c03c4f0 100644 --- a/OpenSim/Grid/UserServer/Main.cs +++ b/OpenSim/Grid/UserServer/Main.cs | |||
| @@ -155,7 +155,7 @@ namespace OpenSim.Grid.UserServer | |||
| 155 | // RestObjectPosterResponse<List<InventoryFolderBase>> requester = new RestObjectPosterResponse<List<InventoryFolderBase>>(); | 155 | // RestObjectPosterResponse<List<InventoryFolderBase>> requester = new RestObjectPosterResponse<List<InventoryFolderBase>>(); |
| 156 | // requester.ReturnResponseVal = TestResponse; | 156 | // requester.ReturnResponseVal = TestResponse; |
| 157 | // requester.BeginPostObject<LLUUID>(m_userManager._config.InventoryUrl + "RootFolders/", m_lastCreatedUser); | 157 | // requester.BeginPostObject<LLUUID>(m_userManager._config.InventoryUrl + "RootFolders/", m_lastCreatedUser); |
| 158 | List<InventoryFolderBase> folders = SyncRestObjectPoster.BeginPostObject<LLUUID, List<InventoryFolderBase>>(m_userManager._config.InventoryUrl + "RootFolders/", m_lastCreatedUser); | 158 | List<InventoryFolderBase> folders = SynchronousRestObjectPoster.BeginPostObject<LLUUID, List<InventoryFolderBase>>(m_userManager._config.InventoryUrl + "RootFolders/", m_lastCreatedUser); |
| 159 | break; | 159 | break; |
| 160 | } | 160 | } |
| 161 | } | 161 | } |
diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs index 1df4d9a..13f8350 100644 --- a/OpenSim/Grid/UserServer/UserLoginService.cs +++ b/OpenSim/Grid/UserServer/UserLoginService.cs | |||
| @@ -197,12 +197,12 @@ namespace OpenSim.Grid.UserServer | |||
| 197 | 197 | ||
| 198 | protected override InventoryData CreateInventoryData(LLUUID userID) | 198 | protected override InventoryData CreateInventoryData(LLUUID userID) |
| 199 | { | 199 | { |
| 200 | List<InventoryFolderBase> folders = SyncRestObjectPoster.BeginPostObject<LLUUID, List<InventoryFolderBase>>(m_config.InventoryUrl + "RootFolders/", userID); | 200 | List<InventoryFolderBase> folders = SynchronousRestObjectPoster.BeginPostObject<LLUUID, List<InventoryFolderBase>>(m_config.InventoryUrl + "RootFolders/", userID); |
| 201 | if (folders ==null | folders.Count == 0) | 201 | if (folders ==null | folders.Count == 0) |
| 202 | { | 202 | { |
| 203 | RestObjectPoster.BeginPostObject<LLUUID>(m_config.InventoryUrl + "CreateInventory/", userID); | 203 | RestObjectPoster.BeginPostObject<LLUUID>(m_config.InventoryUrl + "CreateInventory/", userID); |
| 204 | Thread.Sleep(1000); | 204 | Thread.Sleep(1000); |
| 205 | folders = SyncRestObjectPoster.BeginPostObject<LLUUID, List<InventoryFolderBase>>(m_config.InventoryUrl + "RootFolders/", userID); | 205 | folders = SynchronousRestObjectPoster.BeginPostObject<LLUUID, List<InventoryFolderBase>>(m_config.InventoryUrl + "RootFolders/", userID); |
| 206 | } | 206 | } |
| 207 | 207 | ||
| 208 | if(folders.Count >0) | 208 | if(folders.Count >0) |