diff options
Diffstat (limited to 'OpenSim/Region')
6 files changed, 9 insertions, 8 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs b/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs index 4270222..58777ab 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs | |||
@@ -122,11 +122,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
122 | public event PacketStats OnPacketStats; | 122 | public event PacketStats OnPacketStats; |
123 | public event PacketDrop OnPacketDrop; | 123 | public event PacketDrop OnPacketDrop; |
124 | 124 | ||
125 | private SynchronizeClientHandler m_SynchronizeClient = null; | 125 | |
126 | //private SynchronizeClientHandler m_SynchronizeClient = null; | ||
126 | 127 | ||
127 | public SynchronizeClientHandler SynchronizeClient | 128 | public SynchronizeClientHandler SynchronizeClient |
128 | { | 129 | { |
129 | set { m_SynchronizeClient = value; } | 130 | set { /* m_SynchronizeClient = value; */ } |
130 | } | 131 | } |
131 | 132 | ||
132 | // Packet sequencing | 133 | // Packet sequencing |
diff --git a/OpenSim/Region/Communications/Hypergrid/HGGridServicesGridMode.cs b/OpenSim/Region/Communications/Hypergrid/HGGridServicesGridMode.cs index 85fb4b7..2434d92 100644 --- a/OpenSim/Region/Communications/Hypergrid/HGGridServicesGridMode.cs +++ b/OpenSim/Region/Communications/Hypergrid/HGGridServicesGridMode.cs | |||
@@ -41,7 +41,7 @@ namespace OpenSim.Region.Communications.Hypergrid | |||
41 | { | 41 | { |
42 | public class HGGridServicesGridMode : HGGridServices | 42 | public class HGGridServicesGridMode : HGGridServices |
43 | { | 43 | { |
44 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 44 | //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
45 | 45 | ||
46 | /// <summary> | 46 | /// <summary> |
47 | /// Encapsulate remote backend services for manipulation of grid regions | 47 | /// Encapsulate remote backend services for manipulation of grid regions |
diff --git a/OpenSim/Region/Communications/Hypergrid/HGGridServicesStandalone.cs b/OpenSim/Region/Communications/Hypergrid/HGGridServicesStandalone.cs index 36d4b99..aa2a275 100644 --- a/OpenSim/Region/Communications/Hypergrid/HGGridServicesStandalone.cs +++ b/OpenSim/Region/Communications/Hypergrid/HGGridServicesStandalone.cs | |||
@@ -56,7 +56,7 @@ namespace OpenSim.Region.Communications.Hypergrid | |||
56 | /// </summary> | 56 | /// </summary> |
57 | protected LocalBackEndServices m_localBackend = new LocalBackEndServices(); | 57 | protected LocalBackEndServices m_localBackend = new LocalBackEndServices(); |
58 | 58 | ||
59 | private Dictionary<ulong, int> m_deadRegionCache = new Dictionary<ulong, int>(); | 59 | //private Dictionary<ulong, int> m_deadRegionCache = new Dictionary<ulong, int>(); |
60 | 60 | ||
61 | public LocalBackEndServices LocalBackend | 61 | public LocalBackEndServices LocalBackend |
62 | { | 62 | { |
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index d2d4acd..45ecdc5 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
@@ -426,7 +426,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
426 | throw new Exception("This constructor must specify the xml is in OpenSim's original format"); | 426 | throw new Exception("This constructor must specify the xml is in OpenSim's original format"); |
427 | 427 | ||
428 | //m_log.DebugFormat("[SOG]: Starting deserialization of SOG"); | 428 | //m_log.DebugFormat("[SOG]: Starting deserialization of SOG"); |
429 | int time = System.Environment.TickCount; | 429 | //int time = System.Environment.TickCount; |
430 | 430 | ||
431 | // libomv.types changes UUID to Guid | 431 | // libomv.types changes UUID to Guid |
432 | xmlData = xmlData.Replace("<UUID>", "<Guid>"); | 432 | xmlData = xmlData.Replace("<UUID>", "<Guid>"); |
@@ -769,7 +769,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
769 | public void ToXml2(XmlTextWriter writer) | 769 | public void ToXml2(XmlTextWriter writer) |
770 | { | 770 | { |
771 | //m_log.DebugFormat("[SOG]: Starting serialization of SOG {0} to XML2", Name); | 771 | //m_log.DebugFormat("[SOG]: Starting serialization of SOG {0} to XML2", Name); |
772 | int time = System.Environment.TickCount; | 772 | //int time = System.Environment.TickCount; |
773 | 773 | ||
774 | writer.WriteStartElement(String.Empty, "SceneObjectGroup", String.Empty); | 774 | writer.WriteStartElement(String.Empty, "SceneObjectGroup", String.Empty); |
775 | m_rootPart.ToXml(writer); | 775 | m_rootPart.ToXml(writer); |
diff --git a/OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs b/OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs index 5579848..120eed9 100644 --- a/OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs +++ b/OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs | |||
@@ -42,7 +42,7 @@ namespace OpenSim.Region.Physics.PhysXPlugin | |||
42 | /// </summary> | 42 | /// </summary> |
43 | public class PhysXPlugin : IPhysicsPlugin | 43 | public class PhysXPlugin : IPhysicsPlugin |
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 | private PhysXScene _mScene; | 46 | private PhysXScene _mScene; |
47 | 47 | ||
48 | public PhysXPlugin() | 48 | public PhysXPlugin() |
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs index 5d5e3c5..041e751 100644 --- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs +++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs | |||
@@ -622,7 +622,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools | |||
622 | fs.Read(data, 0, data.Length); | 622 | fs.Read(data, 0, data.Length); |
623 | fs.Close(); | 623 | fs.Close(); |
624 | } | 624 | } |
625 | catch (Exception e) | 625 | catch (Exception) |
626 | { | 626 | { |
627 | string errtext = String.Empty; | 627 | string errtext = String.Empty; |
628 | errtext += "No compile error. But not able to open file."; | 628 | errtext += "No compile error. But not able to open file."; |