aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/EventManager.cs
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/Framework/Scenes/EventManager.cs
parentPrevent "Object->Take" from working on attachments. (diff)
downloadopensim-SC-d42de53ddaeae154f17bbc240bdfdf6a349ea860.zip
opensim-SC-d42de53ddaeae154f17bbc240bdfdf6a349ea860.tar.gz
opensim-SC-d42de53ddaeae154f17bbc240bdfdf6a349ea860.tar.bz2
opensim-SC-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/Framework/Scenes/EventManager.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/EventManager.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/EventManager.cs b/OpenSim/Region/Framework/Scenes/EventManager.cs
index 0a6bca4..8683599 100644
--- a/OpenSim/Region/Framework/Scenes/EventManager.cs
+++ b/OpenSim/Region/Framework/Scenes/EventManager.cs
@@ -748,7 +748,7 @@ namespace OpenSim.Region.Framework.Scenes
748 public event OnIncomingSceneObjectDelegate OnIncomingSceneObject; 748 public event OnIncomingSceneObjectDelegate OnIncomingSceneObject;
749 public delegate void OnIncomingSceneObjectDelegate(SceneObjectGroup so); 749 public delegate void OnIncomingSceneObjectDelegate(SceneObjectGroup so);
750 750
751 public delegate void NewInventoryItemUploadComplete(UUID avatarID, AssetType type, UUID assetID, string name, int userlevel); 751 public delegate void NewInventoryItemUploadComplete(InventoryItemBase item, int userlevel);
752 752
753 public event NewInventoryItemUploadComplete OnNewInventoryItemUploadComplete; 753 public event NewInventoryItemUploadComplete OnNewInventoryItemUploadComplete;
754 754
@@ -2262,7 +2262,7 @@ namespace OpenSim.Region.Framework.Scenes
2262 } 2262 }
2263 } 2263 }
2264 2264
2265 public void TriggerOnNewInventoryItemUploadComplete(UUID agentID, AssetType type, UUID AssetID, String AssetName, int userlevel) 2265 public void TriggerOnNewInventoryItemUploadComplete(InventoryItemBase item, int userlevel)
2266 { 2266 {
2267 NewInventoryItemUploadComplete handlerNewInventoryItemUpdateComplete = OnNewInventoryItemUploadComplete; 2267 NewInventoryItemUploadComplete handlerNewInventoryItemUpdateComplete = OnNewInventoryItemUploadComplete;
2268 if (handlerNewInventoryItemUpdateComplete != null) 2268 if (handlerNewInventoryItemUpdateComplete != null)
@@ -2271,7 +2271,7 @@ namespace OpenSim.Region.Framework.Scenes
2271 { 2271 {
2272 try 2272 try
2273 { 2273 {
2274 d(agentID, type, AssetID, AssetName, userlevel); 2274 d(item, userlevel);
2275 } 2275 }
2276 catch (Exception e) 2276 catch (Exception e)
2277 { 2277 {