diff options
author | Melanie | 2012-10-20 02:33:24 +0100 |
---|---|---|
committer | Melanie | 2012-10-20 02:33:24 +0100 |
commit | 6ad8d3c43f130dfb80a7543e139ffa4dacb840ad (patch) | |
tree | 24baeecab6becf3bb30c26046ea95b75e6bbdc0f /OpenSim/Region/CoreModules/Scripting | |
parent | Merge branch 'master' into careminster (diff) | |
parent | minor: Rename assetCache constructor param in UUIDGatherer to assetService wh... (diff) | |
download | opensim-SC_OLD-6ad8d3c43f130dfb80a7543e139ffa4dacb840ad.zip opensim-SC_OLD-6ad8d3c43f130dfb80a7543e139ffa4dacb840ad.tar.gz opensim-SC_OLD-6ad8d3c43f130dfb80a7543e139ffa4dacb840ad.tar.bz2 opensim-SC_OLD-6ad8d3c43f130dfb80a7543e139ffa4dacb840ad.tar.xz |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/CoreModules/Scripting')
-rw-r--r-- | OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs b/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs index 1f340df..93a045e 100644 --- a/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs +++ b/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs | |||
@@ -42,7 +42,7 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture | |||
42 | { | 42 | { |
43 | public class DynamicTextureModule : IRegionModule, IDynamicTextureManager | 43 | public class DynamicTextureModule : IRegionModule, IDynamicTextureManager |
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 | private const int ALL_SIDES = -1; | 47 | private const int ALL_SIDES = -1; |
48 | 48 | ||