diff options
| author | Melanie | 2013-07-24 04:45:07 +0100 |
|---|---|---|
| committer | Melanie | 2013-07-24 04:45:07 +0100 |
| commit | e82d4154a2e348e4a38f01cb1877878c94569bba (patch) | |
| tree | 7b27e6d30d04f6089fd17d5779cfb0a81e50d508 /OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | For unknown user issue, bump GUN7 to GUN8 and UMMAU3 to UMMAU4 to assess what... (diff) | |
| download | opensim-SC-e82d4154a2e348e4a38f01cb1877878c94569bba.zip opensim-SC-e82d4154a2e348e4a38f01cb1877878c94569bba.tar.gz opensim-SC-e82d4154a2e348e4a38f01cb1877878c94569bba.tar.bz2 opensim-SC-e82d4154a2e348e4a38f01cb1877878c94569bba.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
OpenSim/Region/Physics/Manager/PhysicsActor.cs
OpenSim/Region/Physics/Manager/PhysicsScene.cs
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.Inventory.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index 70018c8..8f6073a 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
| @@ -139,7 +139,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 139 | { | 139 | { |
| 140 | userlevel = 1; | 140 | userlevel = 1; |
| 141 | } | 141 | } |
| 142 | EventManager.TriggerOnNewInventoryItemUploadComplete(item.Owner, item.AssetID, item.Name, userlevel); | 142 | EventManager.TriggerOnNewInventoryItemUploadComplete(item.Owner, (AssetType)item.AssetType, item.AssetID, item.Name, userlevel); |
| 143 | 143 | ||
| 144 | return true; | 144 | return true; |
| 145 | } | 145 | } |
| @@ -178,7 +178,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 178 | { | 178 | { |
| 179 | userlevel = 1; | 179 | userlevel = 1; |
| 180 | } | 180 | } |
| 181 | EventManager.TriggerOnNewInventoryItemUploadComplete(item.Owner, item.AssetID, item.Name, userlevel); | 181 | EventManager.TriggerOnNewInventoryItemUploadComplete(item.Owner, (AssetType)item.AssetType, item.AssetID, item.Name, userlevel); |
| 182 | 182 | ||
| 183 | if (originalFolder != UUID.Zero) | 183 | if (originalFolder != UUID.Zero) |
| 184 | { | 184 | { |