diff options
author | Diva Canto | 2013-07-21 15:46:00 -0700 |
---|---|---|
committer | Diva Canto | 2013-07-23 14:28:53 -0700 |
commit | 7c1eb86c7df2e9c9ccfcf4fe6811af29adbef931 (patch) | |
tree | 4f7452e9931ab5724da28df381b22975db1e6b51 /OpenSim/Region/Framework/Scenes/EventManager.cs | |
parent | Improve spacing between data and units on console stats display (diff) | |
download | opensim-SC_OLD-7c1eb86c7df2e9c9ccfcf4fe6811af29adbef931.zip opensim-SC_OLD-7c1eb86c7df2e9c9ccfcf4fe6811af29adbef931.tar.gz opensim-SC_OLD-7c1eb86c7df2e9c9ccfcf4fe6811af29adbef931.tar.bz2 opensim-SC_OLD-7c1eb86c7df2e9c9ccfcf4fe6811af29adbef931.tar.xz |
Don't post Link asset types back to the home grid
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/EventManager.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/EventManager.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/EventManager.cs b/OpenSim/Region/Framework/Scenes/EventManager.cs index 61b0ebd..39d7512 100644 --- a/OpenSim/Region/Framework/Scenes/EventManager.cs +++ b/OpenSim/Region/Framework/Scenes/EventManager.cs | |||
@@ -742,7 +742,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
742 | public event OnIncomingSceneObjectDelegate OnIncomingSceneObject; | 742 | public event OnIncomingSceneObjectDelegate OnIncomingSceneObject; |
743 | public delegate void OnIncomingSceneObjectDelegate(SceneObjectGroup so); | 743 | public delegate void OnIncomingSceneObjectDelegate(SceneObjectGroup so); |
744 | 744 | ||
745 | public delegate void NewInventoryItemUploadComplete(UUID avatarID, UUID assetID, string name, int userlevel); | 745 | public delegate void NewInventoryItemUploadComplete(UUID avatarID, AssetType type, UUID assetID, string name, int userlevel); |
746 | 746 | ||
747 | public event NewInventoryItemUploadComplete OnNewInventoryItemUploadComplete; | 747 | public event NewInventoryItemUploadComplete OnNewInventoryItemUploadComplete; |
748 | 748 | ||
@@ -2146,7 +2146,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2146 | } | 2146 | } |
2147 | } | 2147 | } |
2148 | 2148 | ||
2149 | public void TriggerOnNewInventoryItemUploadComplete(UUID agentID, UUID AssetID, String AssetName, int userlevel) | 2149 | public void TriggerOnNewInventoryItemUploadComplete(UUID agentID, AssetType type, UUID AssetID, String AssetName, int userlevel) |
2150 | { | 2150 | { |
2151 | NewInventoryItemUploadComplete handlerNewInventoryItemUpdateComplete = OnNewInventoryItemUploadComplete; | 2151 | NewInventoryItemUploadComplete handlerNewInventoryItemUpdateComplete = OnNewInventoryItemUploadComplete; |
2152 | if (handlerNewInventoryItemUpdateComplete != null) | 2152 | if (handlerNewInventoryItemUpdateComplete != null) |
@@ -2155,7 +2155,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2155 | { | 2155 | { |
2156 | try | 2156 | try |
2157 | { | 2157 | { |
2158 | d(agentID, AssetID, AssetName, userlevel); | 2158 | d(agentID, type, AssetID, AssetName, userlevel); |
2159 | } | 2159 | } |
2160 | catch (Exception e) | 2160 | catch (Exception e) |
2161 | { | 2161 | { |