diff options
| author | Melanie | 2013-02-15 21:42:16 +0000 |
|---|---|---|
| committer | Melanie | 2013-02-15 21:42:16 +0000 |
| commit | ea8c5ba707f0c6afd98968b68d13ab03b151b75b (patch) | |
| tree | 9b67be5dd03a8012fb832590b05c550f869601fa /OpenSim/Region/CoreModules/Agent | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Merge branch 'master' of git://opensimulator.org/git/opensim (diff) | |
| download | opensim-SC_OLD-ea8c5ba707f0c6afd98968b68d13ab03b151b75b.zip opensim-SC_OLD-ea8c5ba707f0c6afd98968b68d13ab03b151b75b.tar.gz opensim-SC_OLD-ea8c5ba707f0c6afd98968b68d13ab03b151b75b.tar.bz2 opensim-SC_OLD-ea8c5ba707f0c6afd98968b68d13ab03b151b75b.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/Agent')
| -rw-r--r-- | OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs | 2 |
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 faee189..f489262 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; |