diff options
author | Justin Clarke Casey | 2007-12-15 19:42:23 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2007-12-15 19:42:23 +0000 |
commit | c63369017f0ac8e204f79978f20d5c2abdf5bef2 (patch) | |
tree | 97b26f9efc262bdf0d691e84bf19f2175124984b /OpenSim/Region/Communications/OGS1 | |
parent | * Added support for multiple terrain blocks to be edited at the same time (diff) | |
download | opensim-SC-c63369017f0ac8e204f79978f20d5c2abdf5bef2.zip opensim-SC-c63369017f0ac8e204f79978f20d5c2abdf5bef2.tar.gz opensim-SC-c63369017f0ac8e204f79978f20d5c2abdf5bef2.tar.bz2 opensim-SC-c63369017f0ac8e204f79978f20d5c2abdf5bef2.tar.xz |
* Make inventory operations sync rather than async. This is to alleviate race conditions such as that in mantis #190
* Make inventory messages more verbose. Hopefully they aren't now too verbose
* This may resolve some grid instability but it's likely there's much more out there.
Diffstat (limited to 'OpenSim/Region/Communications/OGS1')
-rw-r--r-- | OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs | 37 |
1 files changed, 9 insertions, 28 deletions
diff --git a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs index 4f5d9ab..709a227 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs | |||
@@ -117,45 +117,26 @@ namespace OpenSim.Region.Communications.OGS1 | |||
117 | 117 | ||
118 | public void AddNewInventoryFolder(LLUUID userID, InventoryFolderBase folder) | 118 | public void AddNewInventoryFolder(LLUUID userID, InventoryFolderBase folder) |
119 | { | 119 | { |
120 | try | 120 | SynchronousRestObjectPoster.BeginPostObject<InventoryFolderBase, bool>( |
121 | { | 121 | "POST", _inventoryServerUrl + "/NewFolder/", folder); |
122 | RestObjectPoster.BeginPostObject<InventoryFolderBase>(_inventoryServerUrl + "/NewFolder/", folder); | ||
123 | } | ||
124 | catch (Exception) | ||
125 | { | ||
126 | } | ||
127 | } | 122 | } |
128 | 123 | ||
129 | public void MoveInventoryFolder(LLUUID userID, InventoryFolderBase folder) | 124 | public void MoveInventoryFolder(LLUUID userID, InventoryFolderBase folder) |
130 | { | 125 | { |
131 | try | 126 | SynchronousRestObjectPoster.BeginPostObject<InventoryFolderBase, bool>( |
132 | { | 127 | "POST", _inventoryServerUrl + "/MoveFolder/", folder); |
133 | RestObjectPoster.BeginPostObject<InventoryFolderBase>(_inventoryServerUrl + "/MoveFolder/", folder); | ||
134 | } | ||
135 | catch (Exception) | ||
136 | { | ||
137 | } | ||
138 | } | 128 | } |
129 | |||
139 | public void AddNewInventoryItem(LLUUID userID, InventoryItemBase item) | 130 | public void AddNewInventoryItem(LLUUID userID, InventoryItemBase item) |
140 | { | 131 | { |
141 | try | 132 | SynchronousRestObjectPoster.BeginPostObject<InventoryItemBase, bool>( |
142 | { | 133 | "POST", _inventoryServerUrl + "/NewItem/", item); |
143 | RestObjectPoster.BeginPostObject<InventoryItemBase>(_inventoryServerUrl + "/NewItem/", item); | ||
144 | } | ||
145 | catch (Exception) | ||
146 | { | ||
147 | } | ||
148 | } | 134 | } |
149 | 135 | ||
150 | public void DeleteInventoryItem(LLUUID userID, InventoryItemBase item) | 136 | public void DeleteInventoryItem(LLUUID userID, InventoryItemBase item) |
151 | { | 137 | { |
152 | try | 138 | SynchronousRestObjectPoster.BeginPostObject<InventoryItemBase, bool>( |
153 | { | 139 | "POST", _inventoryServerUrl + "/DeleteItem/", item); |
154 | RestObjectPoster.BeginPostObject<InventoryItemBase>(_inventoryServerUrl + "/DeleteItem/", item); | ||
155 | } | ||
156 | catch (Exception) | ||
157 | { | ||
158 | } | ||
159 | } | 140 | } |
160 | 141 | ||
161 | public void CreateNewUserInventory(LLUUID user) | 142 | public void CreateNewUserInventory(LLUUID user) |