Merge branch 'master' into bulletsim

author: Mic Bowman 2011-08-05 11:13:02 -0700
committer: Mic Bowman 2011-08-05 11:13:02 -0700
commit: c3f579046c4de7a5a65e71e4c02958425fd7998a (patch)
tree: b725d9eaa66d5eb7cf1f87ddbb4fa0f4284f71f5 /OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCapsModule.cs
parent: BulletSim: Parameters settable from ini file. Linksets. Physical property val... (diff)
parent: remove the largely unused copy/pasted HandleAgentRequestSit() method (diff)
download: opensim-SC_OLD-c3f579046c4de7a5a65e71e4c02958425fd7998a.zip
opensim-SC_OLD-c3f579046c4de7a5a65e71e4c02958425fd7998a.tar.gz
opensim-SC_OLD-c3f579046c4de7a5a65e71e4c02958425fd7998a.tar.bz2
opensim-SC_OLD-c3f579046c4de7a5a65e71e4c02958425fd7998a.tar.xz
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCapsModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCapsModule.cs
index 14160ae..66b865f 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCapsModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCapsModule.cs
@@ -48,8 +48,8 @@ namespace OpenSim.Region.ClientStack.Linden
    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
    public class BunchOfCapsModule : INonSharedRegionModule
    {
-        private static readonly ILog m_log =
+//        private static readonly ILog m_log =
-            LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+//            LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
        private Scene m_Scene;
author	Mic Bowman	2011-08-05 11:13:02 -0700
committer	Mic Bowman	2011-08-05 11:13:02 -0700
commit	c3f579046c4de7a5a65e71e4c02958425fd7998a (patch)
tree	b725d9eaa66d5eb7cf1f87ddbb4fa0f4284f71f5 /OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCapsModule.cs
parent	BulletSim: Parameters settable from ini file. Linksets. Physical property val... (diff)
parent	remove the largely unused copy/pasted HandleAgentRequestSit() method (diff)
download	opensim-SC_OLD-c3f579046c4de7a5a65e71e4c02958425fd7998a.zip opensim-SC_OLD-c3f579046c4de7a5a65e71e4c02958425fd7998a.tar.gz opensim-SC_OLD-c3f579046c4de7a5a65e71e4c02958425fd7998a.tar.bz2 opensim-SC_OLD-c3f579046c4de7a5a65e71e4c02958425fd7998a.tar.xz

diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCapsModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCapsModule.cs index 14160ae..66b865f 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCapsModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCapsModule.cs
@@ -48,8 +48,8 @@ namespace OpenSim.Region.ClientStack.Linden
48	[Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]	48	[Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
49	public class BunchOfCapsModule : INonSharedRegionModule	49	public class BunchOfCapsModule : INonSharedRegionModule
50	{	50	{
51	private static readonly ILog m_log =	51	// private static readonly ILog m_log =
52	LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);	52	// LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
53		53
54	private Scene m_Scene;	54	private Scene m_Scene;
55		55