diff options
author | Melanie | 2011-11-14 20:03:47 +0000 |
---|---|---|
committer | Melanie | 2011-11-14 20:03:47 +0000 |
commit | afca742392e30748de13a125f932046949af0bcb (patch) | |
tree | 34e9dd92533abe446e356d9fb1ad8625cb28c9bc /OpenSim/Region/CoreModules/Agent | |
parent | Merge branch 'master' into bigmerge (diff) | |
parent | minor: remove some mono compiler warnings (diff) | |
download | opensim-SC_OLD-afca742392e30748de13a125f932046949af0bcb.zip opensim-SC_OLD-afca742392e30748de13a125f932046949af0bcb.tar.gz opensim-SC_OLD-afca742392e30748de13a125f932046949af0bcb.tar.bz2 opensim-SC_OLD-afca742392e30748de13a125f932046949af0bcb.tar.xz |
Merge branch 'master' into bigmerge
Conflicts:
OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/Agent')
-rw-r--r-- | OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs index eed7cd5..b557ffe 100644 --- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs +++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs | |||
@@ -46,7 +46,6 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction | |||
46 | // Fields | 46 | // Fields |
47 | private bool m_dumpAssetsToFile; | 47 | private bool m_dumpAssetsToFile; |
48 | private Scene m_Scene; | 48 | private Scene m_Scene; |
49 | private UUID UserID; | ||
50 | private Dictionary<UUID, AssetXferUploader> XferUploaders = new Dictionary<UUID, AssetXferUploader>(); | 49 | private Dictionary<UUID, AssetXferUploader> XferUploaders = new Dictionary<UUID, AssetXferUploader>(); |
51 | 50 | ||
52 | // Methods | 51 | // Methods |
@@ -54,7 +53,6 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction | |||
54 | bool dumpAssetsToFile) | 53 | bool dumpAssetsToFile) |
55 | { | 54 | { |
56 | m_Scene = scene; | 55 | m_Scene = scene; |
57 | UserID = agentID; | ||
58 | m_dumpAssetsToFile = dumpAssetsToFile; | 56 | m_dumpAssetsToFile = dumpAssetsToFile; |
59 | } | 57 | } |
60 | 58 | ||