diff options
author | Justin Clark-Casey (justincc) | 2013-07-23 23:32:24 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2013-07-23 23:32:24 +0100 |
commit | fa2653c8e1a5712777f040834bb49aa69661f5eb (patch) | |
tree | 4b10e7be30e73ae41e4c2f12088294a13b615eac /OpenSim/Region/CoreModules/Framework | |
parent | Correct issue where the last instance of a sampled stat was shown 3x larger t... (diff) | |
parent | Don't touch the Current Outfit folder also on coming back home (diff) | |
download | opensim-SC_OLD-fa2653c8e1a5712777f040834bb49aa69661f5eb.zip opensim-SC_OLD-fa2653c8e1a5712777f040834bb49aa69661f5eb.tar.gz opensim-SC_OLD-fa2653c8e1a5712777f040834bb49aa69661f5eb.tar.bz2 opensim-SC_OLD-fa2653c8e1a5712777f040834bb49aa69661f5eb.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs index e0c8ea6..8f9800f 100644 --- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs +++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs | |||
@@ -185,8 +185,11 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
185 | } | 185 | } |
186 | } | 186 | } |
187 | 187 | ||
188 | public void UploadInventoryItem(UUID avatarID, UUID assetID, string name, int userlevel) | 188 | public void UploadInventoryItem(UUID avatarID, AssetType type, UUID assetID, string name, int userlevel) |
189 | { | 189 | { |
190 | if (type == AssetType.Link) | ||
191 | return; | ||
192 | |||
190 | string userAssetServer = string.Empty; | 193 | string userAssetServer = string.Empty; |
191 | if (IsForeignUser(avatarID, out userAssetServer) && userAssetServer != string.Empty && m_OutboundPermission) | 194 | if (IsForeignUser(avatarID, out userAssetServer) && userAssetServer != string.Empty && m_OutboundPermission) |
192 | { | 195 | { |
@@ -221,7 +224,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
221 | { | 224 | { |
222 | UUID newAssetID = base.CapsUpdateInventoryItemAsset(remoteClient, itemID, data); | 225 | UUID newAssetID = base.CapsUpdateInventoryItemAsset(remoteClient, itemID, data); |
223 | 226 | ||
224 | UploadInventoryItem(remoteClient.AgentId, newAssetID, "", 0); | 227 | UploadInventoryItem(remoteClient.AgentId, AssetType.Unknown, newAssetID, "", 0); |
225 | 228 | ||
226 | return newAssetID; | 229 | return newAssetID; |
227 | } | 230 | } |
@@ -232,7 +235,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
232 | protected override void ExportAsset(UUID agentID, UUID assetID) | 235 | protected override void ExportAsset(UUID agentID, UUID assetID) |
233 | { | 236 | { |
234 | if (!assetID.Equals(UUID.Zero)) | 237 | if (!assetID.Equals(UUID.Zero)) |
235 | UploadInventoryItem(agentID, assetID, "", 0); | 238 | UploadInventoryItem(agentID, AssetType.Unknown, assetID, "", 0); |
236 | else | 239 | else |
237 | m_log.Debug("[HGScene]: Scene.Inventory did not create asset"); | 240 | m_log.Debug("[HGScene]: Scene.Inventory did not create asset"); |
238 | } | 241 | } |
@@ -348,7 +351,15 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
348 | InventoryFolderBase root = m_Scene.InventoryService.GetRootFolder(client.AgentId); | 351 | InventoryFolderBase root = m_Scene.InventoryService.GetRootFolder(client.AgentId); |
349 | InventoryCollection content = m_Scene.InventoryService.GetFolderContent(client.AgentId, root.ID); | 352 | InventoryCollection content = m_Scene.InventoryService.GetFolderContent(client.AgentId, root.ID); |
350 | 353 | ||
351 | inv.SendBulkUpdateInventory(content.Folders.ToArray(), content.Items.ToArray()); | 354 | List<InventoryFolderBase> keep = new List<InventoryFolderBase>(); |
355 | |||
356 | foreach (InventoryFolderBase f in content.Folders) | ||
357 | { | ||
358 | if (f.Name != "My Suitcase" && f.Name != "Current Outfit") | ||
359 | keep.Add(f); | ||
360 | } | ||
361 | |||
362 | inv.SendBulkUpdateInventory(keep.ToArray(), content.Items.ToArray()); | ||
352 | } | 363 | } |
353 | } | 364 | } |
354 | } | 365 | } |
@@ -381,7 +392,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
381 | 392 | ||
382 | foreach (InventoryFolderBase f in content.Folders) | 393 | foreach (InventoryFolderBase f in content.Folders) |
383 | { | 394 | { |
384 | if (f.Name != "My Suitcase") | 395 | if (f.Name != "My Suitcase" && f.Name != "Current Outfit") |
385 | { | 396 | { |
386 | f.Name = f.Name + " (Unavailable)"; | 397 | f.Name = f.Name + " (Unavailable)"; |
387 | keep.Add(f); | 398 | keep.Add(f); |