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

author: Diva Canto 2015-01-22 10:45:46 -0800
committer: Diva Canto 2015-01-22 10:45:46 -0800
commit: edc155c6367bdc81303b56aee0c724ce7aeaa0d8 (patch)
tree: 33ddce1499ec22dab20935148cacc24f9dc2031c /OpenSim/Tools/pCampBot
parent: On the GridService, the central simulator features: ensure that the map tile ... (diff)
parent: Stop currently unsettable display names from appearing when [ClientStack.Lind... (diff)
download: opensim-SC_OLD-edc155c6367bdc81303b56aee0c724ce7aeaa0d8.zip
opensim-SC_OLD-edc155c6367bdc81303b56aee0c724ce7aeaa0d8.tar.gz
opensim-SC_OLD-edc155c6367bdc81303b56aee0c724ce7aeaa0d8.tar.bz2
opensim-SC_OLD-edc155c6367bdc81303b56aee0c724ce7aeaa0d8.tar.xz
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Tools/pCampBot/Behaviours/PhysicsBehaviour2.cs b/OpenSim/Tools/pCampBot/Behaviours/PhysicsBehaviour2.cs
index 326396d..1ec2046 100644
--- a/OpenSim/Tools/pCampBot/Behaviours/PhysicsBehaviour2.cs
+++ b/OpenSim/Tools/pCampBot/Behaviours/PhysicsBehaviour2.cs
@@ -43,7 +43,7 @@ namespace pCampBot
    /// </summary>
    public class PhysicsBehaviour2 : AbstractBehaviour
    {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
        public PhysicsBehaviour2() 
        { 
diff --git a/OpenSim/Tools/pCampBot/Behaviours/TwitchyBehaviour.cs b/OpenSim/Tools/pCampBot/Behaviours/TwitchyBehaviour.cs
index ae40bae..7b4639d 100644
--- a/OpenSim/Tools/pCampBot/Behaviours/TwitchyBehaviour.cs
+++ b/OpenSim/Tools/pCampBot/Behaviours/TwitchyBehaviour.cs
@@ -44,7 +44,7 @@ namespace pCampBot
    /// </summary>
    public class TwitchyBehaviour : AbstractBehaviour
    {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
        public TwitchyBehaviour() 
        {
author	Diva Canto	2015-01-22 10:45:46 -0800
committer	Diva Canto	2015-01-22 10:45:46 -0800
commit	edc155c6367bdc81303b56aee0c724ce7aeaa0d8 (patch)
tree	33ddce1499ec22dab20935148cacc24f9dc2031c /OpenSim/Tools/pCampBot
parent	On the GridService, the central simulator features: ensure that the map tile ... (diff)
parent	Stop currently unsettable display names from appearing when [ClientStack.Lind... (diff)
download	opensim-SC_OLD-edc155c6367bdc81303b56aee0c724ce7aeaa0d8.zip opensim-SC_OLD-edc155c6367bdc81303b56aee0c724ce7aeaa0d8.tar.gz opensim-SC_OLD-edc155c6367bdc81303b56aee0c724ce7aeaa0d8.tar.bz2 opensim-SC_OLD-edc155c6367bdc81303b56aee0c724ce7aeaa0d8.tar.xz

diff --git a/OpenSim/Tools/pCampBot/Behaviours/PhysicsBehaviour2.cs b/OpenSim/Tools/pCampBot/Behaviours/PhysicsBehaviour2.cs index 326396d..1ec2046 100644 --- a/OpenSim/Tools/pCampBot/Behaviours/PhysicsBehaviour2.cs +++ b/OpenSim/Tools/pCampBot/Behaviours/PhysicsBehaviour2.cs
@@ -43,7 +43,7 @@ namespace pCampBot
43	/// </summary>	43	/// </summary>
44	public class PhysicsBehaviour2 : AbstractBehaviour	44	public class PhysicsBehaviour2 : AbstractBehaviour
45	{	45	{
46	private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);	46	// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
47		47
48	public PhysicsBehaviour2()	48	public PhysicsBehaviour2()
49	{	49	{


diff --git a/OpenSim/Tools/pCampBot/Behaviours/TwitchyBehaviour.cs b/OpenSim/Tools/pCampBot/Behaviours/TwitchyBehaviour.cs index ae40bae..7b4639d 100644 --- a/OpenSim/Tools/pCampBot/Behaviours/TwitchyBehaviour.cs +++ b/OpenSim/Tools/pCampBot/Behaviours/TwitchyBehaviour.cs
@@ -44,7 +44,7 @@ namespace pCampBot
44	/// </summary>	44	/// </summary>
45	public class TwitchyBehaviour : AbstractBehaviour	45	public class TwitchyBehaviour : AbstractBehaviour
46	{	46	{
47	private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);	47	// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
48		48
49	public TwitchyBehaviour()	49	public TwitchyBehaviour()
50	{	50	{