diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs b/OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs index 4224198..5d65f98 100644 --- a/OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs +++ b/OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs | |||
@@ -201,31 +201,31 @@ namespace OpenSim.Region.Framework.Scenes.Hypergrid | |||
201 | } | 201 | } |
202 | } | 202 | } |
203 | 203 | ||
204 | public InventoryItemBase Get(InventoryItemBase item, UUID rootFolder, CachedUserInfo userInfo) | 204 | //public InventoryItemBase Get(InventoryItemBase item, UUID rootFolder, CachedUserInfo userInfo) |
205 | { | 205 | //{ |
206 | InventoryClient invCli = null; | 206 | // InventoryClient invCli = null; |
207 | string inventoryURL = UserInventoryURL(item.Owner); | 207 | // string inventoryURL = UserInventoryURL(item.Owner); |
208 | if (!m_inventoryServers.TryGetValue(inventoryURL, out invCli)) | 208 | // if (!m_inventoryServers.TryGetValue(inventoryURL, out invCli)) |
209 | { | 209 | // { |
210 | m_log.Debug("[HGScene]: Starting new InventorytClient for " + inventoryURL); | 210 | // m_log.Debug("[HGScene]: Starting new InventorytClient for " + inventoryURL); |
211 | invCli = new InventoryClient(inventoryURL); | 211 | // invCli = new InventoryClient(inventoryURL); |
212 | m_inventoryServers.Add(inventoryURL, invCli); | 212 | // m_inventoryServers.Add(inventoryURL, invCli); |
213 | } | 213 | // } |
214 | 214 | ||
215 | item = invCli.GetInventoryItem(item); | 215 | // item = invCli.GetInventoryItem(item); |
216 | if (item != null) | 216 | // if (item != null) |
217 | { | 217 | // { |
218 | // Change the folder, stick it in root folder, all items flattened out here in this region cache | 218 | // // Change the folder, stick it in root folder, all items flattened out here in this region cache |
219 | item.Folder = rootFolder; | 219 | // item.Folder = rootFolder; |
220 | //userInfo.AddItem(item); don't use this, it calls back to the inventory server | 220 | // //userInfo.AddItem(item); don't use this, it calls back to the inventory server |
221 | lock (userInfo.RootFolder.Items) | 221 | // lock (userInfo.RootFolder.Items) |
222 | { | 222 | // { |
223 | userInfo.RootFolder.Items[item.ID] = item; | 223 | // userInfo.RootFolder.Items[item.ID] = item; |
224 | } | 224 | // } |
225 | 225 | ||
226 | } | 226 | // } |
227 | return item; | 227 | // return item; |
228 | } | 228 | //} |
229 | 229 | ||
230 | public void Post(UUID assetID, UUID ownerID) | 230 | public void Post(UUID assetID, UUID ownerID) |
231 | { | 231 | { |