aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Agent
diff options
context:
space:
mode:
authorMelanie Thielker2016-04-29 21:23:32 +0200
committerMelanie Thielker2016-04-29 21:23:32 +0200
commitd42de53ddaeae154f17bbc240bdfdf6a349ea860 (patch)
tree2c5f3a9347a843251f61d633d0fa40e2275dc3d9 /OpenSim/Region/CoreModules/Agent
parentPrevent "Object->Take" from working on attachments. (diff)
downloadopensim-SC_OLD-d42de53ddaeae154f17bbc240bdfdf6a349ea860.zip
opensim-SC_OLD-d42de53ddaeae154f17bbc240bdfdf6a349ea860.tar.gz
opensim-SC_OLD-d42de53ddaeae154f17bbc240bdfdf6a349ea860.tar.bz2
opensim-SC_OLD-d42de53ddaeae154f17bbc240bdfdf6a349ea860.tar.xz
Allow default permissions from the viewer to be applied to uploaded objects.
Make inventory items reflect coorect permissions immediately unstead of after relog
Diffstat (limited to 'OpenSim/Region/CoreModules/Agent')
-rw-r--r--OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
index 64bcfa2..60a254e 100644
--- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
+++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
@@ -429,7 +429,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
429 429
430 m_transactions.RemoveXferUploader(m_transactionID); 430 m_transactions.RemoveXferUploader(m_transactionID);
431 431
432 m_Scene.EventManager.TriggerOnNewInventoryItemUploadComplete(ourClient.AgentId, (AssetType)type, m_asset.FullID, m_asset.Name, 0); 432 m_Scene.EventManager.TriggerOnNewInventoryItemUploadComplete(item, 0);
433 } 433 }
434 434
435 /// <summary> 435 /// <summary>