diff options
| author | MW | 2007-12-05 19:02:57 +0000 |
|---|---|---|
| committer | MW | 2007-12-05 19:02:57 +0000 |
| commit | d2736437d42758ddefee4e50e23c465e514077be (patch) | |
| tree | 35d9ece58c1c9d63d28015a60964a5103eb1a343 /OpenSim/Grid | |
| parent | From Justin Casey (IBM) (diff) | |
| download | opensim-SC_OLD-d2736437d42758ddefee4e50e23c465e514077be.zip opensim-SC_OLD-d2736437d42758ddefee4e50e23c465e514077be.tar.gz opensim-SC_OLD-d2736437d42758ddefee4e50e23c465e514077be.tar.bz2 opensim-SC_OLD-d2736437d42758ddefee4e50e23c465e514077be.tar.xz | |
Some refactoring of the RestObjectPoster (and related classes).
Diffstat (limited to '')
| -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 634698e..d2ad6ae 100644 --- a/OpenSim/Grid/UserServer/Main.cs +++ b/OpenSim/Grid/UserServer/Main.cs | |||
| @@ -157,7 +157,7 @@ namespace OpenSim.Grid.UserServer | |||
| 157 | // RestObjectPosterResponse<List<InventoryFolderBase>> requester = new RestObjectPosterResponse<List<InventoryFolderBase>>(); | 157 | // RestObjectPosterResponse<List<InventoryFolderBase>> requester = new RestObjectPosterResponse<List<InventoryFolderBase>>(); |
| 158 | // requester.ReturnResponseVal = TestResponse; | 158 | // requester.ReturnResponseVal = TestResponse; |
| 159 | // requester.BeginPostObject<LLUUID>(m_userManager._config.InventoryUrl + "RootFolders/", m_lastCreatedUser); | 159 | // requester.BeginPostObject<LLUUID>(m_userManager._config.InventoryUrl + "RootFolders/", m_lastCreatedUser); |
| 160 | List<InventoryFolderBase> folders = SynchronousRestObjectPoster.BeginPostObject<LLUUID, List<InventoryFolderBase>>(m_userManager._config.InventoryUrl + "RootFolders/", m_lastCreatedUser); | 160 | List<InventoryFolderBase> folders = SynchronousRestObjectPoster.BeginPostObject< LLUUID, List<InventoryFolderBase>>("POST",m_userManager._config.InventoryUrl + "RootFolders/", m_lastCreatedUser); |
| 161 | break; | 161 | break; |
| 162 | } | 162 | } |
| 163 | } | 163 | } |
diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs index 4d1328e..ccd3548 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 = SynchronousRestObjectPoster.BeginPostObject<LLUUID, List<InventoryFolderBase>>(m_config.InventoryUrl + "RootFolders/", userID); | 200 | List<InventoryFolderBase> folders = SynchronousRestObjectPoster.BeginPostObject<LLUUID, List<InventoryFolderBase>>("POST", 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 = SynchronousRestObjectPoster.BeginPostObject<LLUUID, List<InventoryFolderBase>>(m_config.InventoryUrl + "RootFolders/", userID); | 205 | folders = SynchronousRestObjectPoster.BeginPostObject<LLUUID, List<InventoryFolderBase>>("POST", m_config.InventoryUrl + "RootFolders/", userID); |
| 206 | } | 206 | } |
| 207 | 207 | ||
| 208 | if(folders.Count >0) | 208 | if(folders.Count >0) |