aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs2
-rw-r--r--OpenSim/Region/Environment/Modules/Avatar/Combat/CombatModule.cs4
2 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs b/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs
index ce7896e..3b3eb91 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs
@@ -49,7 +49,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
49 uint port = 666; 49 uint port = 666;
50 llUdpServer.Initialise(null, ref port, -1, false, new ClientStackUserSettings(), null, null); 50 llUdpServer.Initialise(null, ref port, -1, false, new ClientStackUserSettings(), null, null);
51 51
52 UseCircuitCodePacket uccp = new UseCircuitCodePacket(); 52 //UseCircuitCodePacket uccp = new UseCircuitCodePacket();
53 //llUdpServer.epS 53 //llUdpServer.epS
54 } 54 }
55 } 55 }
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Combat/CombatModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Combat/CombatModule.cs
index 1f16421..6a09f2b 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Combat/CombatModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Combat/CombatModule.cs
@@ -46,12 +46,12 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Combat.CombatModule
46{ 46{
47 public class CombatModule : IRegionModule 47 public class CombatModule : IRegionModule
48 { 48 {
49 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 49 //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
50 50
51 /// <summary> 51 /// <summary>
52 /// Region UUIDS indexed by AgentID 52 /// Region UUIDS indexed by AgentID
53 /// </summary> 53 /// </summary>
54 private Dictionary<UUID, UUID> m_rootAgents = new Dictionary<UUID, UUID>(); 54 //private Dictionary<UUID, UUID> m_rootAgents = new Dictionary<UUID, UUID>();
55 55
56 /// <summary> 56 /// <summary>
57 /// Scenes by Region Handle 57 /// Scenes by Region Handle