Merge branch 'master' of git://opensimulator.org/git/opensim

author: Dan Lake 2013-02-14 20:06:22 -0800
committer: Dan Lake 2013-02-14 20:06:22 -0800
commit: e09467b30d5d27181c158961e95df25cd6001be5 (patch)
tree: 439acb650990a3495187f55d8a69b9a78f359c00 /OpenSim/Region/CoreModules/Agent/AssetTransaction
parent: Use SortedDictionary in StatsManager instead of regular Dictionary so stats w... (diff)
parent: Enable one sub-test in TestJsonSetValue() which now works (using identifier w... (diff)
download: opensim-SC-e09467b30d5d27181c158961e95df25cd6001be5.zip
opensim-SC-e09467b30d5d27181c158961e95df25cd6001be5.tar.gz
opensim-SC-e09467b30d5d27181c158961e95df25cd6001be5.tar.bz2
opensim-SC-e09467b30d5d27181c158961e95df25cd6001be5.tar.xz
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs
index d1ad74f..b67c0df 100644
--- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs
+++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs
@@ -42,7 +42,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
    public class AssetTransactionModule : INonSharedRegionModule,
            IAgentAssetTransactions
    {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
        
        protected Scene m_Scene;
        private bool m_dumpAssetsToFile = false;
author	Dan Lake	2013-02-14 20:06:22 -0800
committer	Dan Lake	2013-02-14 20:06:22 -0800
commit	e09467b30d5d27181c158961e95df25cd6001be5 (patch)
tree	439acb650990a3495187f55d8a69b9a78f359c00 /OpenSim/Region/CoreModules/Agent/AssetTransaction
parent	Use SortedDictionary in StatsManager instead of regular Dictionary so stats w... (diff)
parent	Enable one sub-test in TestJsonSetValue() which now works (using identifier w... (diff)
download	opensim-SC-e09467b30d5d27181c158961e95df25cd6001be5.zip opensim-SC-e09467b30d5d27181c158961e95df25cd6001be5.tar.gz opensim-SC-e09467b30d5d27181c158961e95df25cd6001be5.tar.bz2 opensim-SC-e09467b30d5d27181c158961e95df25cd6001be5.tar.xz

diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs index d1ad74f..b67c0df 100644 --- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs +++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs
@@ -42,7 +42,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
42	public class AssetTransactionModule : INonSharedRegionModule,	42	public class AssetTransactionModule : INonSharedRegionModule,
43	IAgentAssetTransactions	43	IAgentAssetTransactions
44	{	44	{
45	private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);	45	// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
46		46
47	protected Scene m_Scene;	47	protected Scene m_Scene;
48	private bool m_dumpAssetsToFile = false;	48	private bool m_dumpAssetsToFile = false;