diff options
18 files changed, 26 insertions, 23 deletions
diff --git a/OpenSim/Client/MXP/MXPModule.cs b/OpenSim/Client/MXP/MXPModule.cs index 552c3b7..581239f 100644 --- a/OpenSim/Client/MXP/MXPModule.cs +++ b/OpenSim/Client/MXP/MXPModule.cs | |||
@@ -41,7 +41,7 @@ namespace OpenSim.Client.MXP | |||
41 | public class MXPModule : IRegionModule | 41 | public class MXPModule : IRegionModule |
42 | { | 42 | { |
43 | private int mxp_Port = 1253; | 43 | private int mxp_Port = 1253; |
44 | private double mxp_BubbleRadius = 181.01933598375616624661615669884; // Radius of a sphere big enough to encapsulate a 256x256 square | 44 | //private double mxp_BubbleRadius = 181.01933598375616624661615669884; // Radius of a sphere big enough to encapsulate a 256x256 square |
45 | 45 | ||
46 | private readonly Timer ticker = new Timer(100); | 46 | private readonly Timer ticker = new Timer(100); |
47 | 47 | ||
diff --git a/OpenSim/Data/Tests/BasicAssetTest.cs b/OpenSim/Data/Tests/BasicAssetTest.cs index e7faebb..2a70711 100644 --- a/OpenSim/Data/Tests/BasicAssetTest.cs +++ b/OpenSim/Data/Tests/BasicAssetTest.cs | |||
@@ -38,7 +38,7 @@ namespace OpenSim.Data.Tests | |||
38 | { | 38 | { |
39 | public class BasicAssetTest | 39 | public class BasicAssetTest |
40 | { | 40 | { |
41 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 41 | //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
42 | public AssetDataBase db; | 42 | public AssetDataBase db; |
43 | public UUID uuid1; | 43 | public UUID uuid1; |
44 | public UUID uuid2; | 44 | public UUID uuid2; |
diff --git a/OpenSim/Data/Tests/BasicEstateTest.cs b/OpenSim/Data/Tests/BasicEstateTest.cs index f74a222..0b24fde 100644 --- a/OpenSim/Data/Tests/BasicEstateTest.cs +++ b/OpenSim/Data/Tests/BasicEstateTest.cs | |||
@@ -40,7 +40,7 @@ namespace OpenSim.Data.Tests | |||
40 | { | 40 | { |
41 | public class BasicEstateTest | 41 | public class BasicEstateTest |
42 | { | 42 | { |
43 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 43 | //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
44 | public IEstateDataStore db; | 44 | public IEstateDataStore db; |
45 | public IRegionDataStore regionDb; | 45 | public IRegionDataStore regionDb; |
46 | 46 | ||
diff --git a/OpenSim/Data/Tests/BasicGridTest.cs b/OpenSim/Data/Tests/BasicGridTest.cs index 8841bae..86c3115 100644 --- a/OpenSim/Data/Tests/BasicGridTest.cs +++ b/OpenSim/Data/Tests/BasicGridTest.cs | |||
@@ -39,7 +39,7 @@ namespace OpenSim.Data.Tests | |||
39 | { | 39 | { |
40 | public class BasicGridTest | 40 | public class BasicGridTest |
41 | { | 41 | { |
42 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 42 | //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
43 | public GridDataBase db; | 43 | public GridDataBase db; |
44 | public UUID region1, region2, region3; | 44 | public UUID region1, region2, region3; |
45 | public UUID zero = UUID.Zero; | 45 | public UUID zero = UUID.Zero; |
diff --git a/OpenSim/Data/Tests/BasicInventoryTest.cs b/OpenSim/Data/Tests/BasicInventoryTest.cs index e5642f1..65c61cd 100644 --- a/OpenSim/Data/Tests/BasicInventoryTest.cs +++ b/OpenSim/Data/Tests/BasicInventoryTest.cs | |||
@@ -38,7 +38,7 @@ namespace OpenSim.Data.Tests | |||
38 | { | 38 | { |
39 | public class BasicInventoryTest | 39 | public class BasicInventoryTest |
40 | { | 40 | { |
41 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 41 | //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
42 | public IInventoryDataPlugin db; | 42 | public IInventoryDataPlugin db; |
43 | public UUID zero = UUID.Zero; | 43 | public UUID zero = UUID.Zero; |
44 | 44 | ||
diff --git a/OpenSim/Data/Tests/BasicUserTest.cs b/OpenSim/Data/Tests/BasicUserTest.cs index 151faa2..82ff08b 100644 --- a/OpenSim/Data/Tests/BasicUserTest.cs +++ b/OpenSim/Data/Tests/BasicUserTest.cs | |||
@@ -42,7 +42,7 @@ namespace OpenSim.Data.Tests | |||
42 | { | 42 | { |
43 | public class BasicUserTest | 43 | public class BasicUserTest |
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 | public IUserDataPlugin db; | 46 | public IUserDataPlugin db; |
47 | public UUID user1; | 47 | public UUID user1; |
48 | public UUID user2; | 48 | public UUID user2; |
diff --git a/OpenSim/Grid/AssetInventoryServer/Plugins/BrowseFrontendPlugin.cs b/OpenSim/Grid/AssetInventoryServer/Plugins/BrowseFrontendPlugin.cs index 6430e2a..6e7519d 100644 --- a/OpenSim/Grid/AssetInventoryServer/Plugins/BrowseFrontendPlugin.cs +++ b/OpenSim/Grid/AssetInventoryServer/Plugins/BrowseFrontendPlugin.cs | |||
@@ -42,7 +42,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins | |||
42 | public class BrowseFrontendPlugin : IAssetInventoryServerPlugin | 42 | public class BrowseFrontendPlugin : IAssetInventoryServerPlugin |
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 | private AssetInventoryServer m_server; | 45 | //private AssetInventoryServer m_server; |
46 | 46 | ||
47 | public BrowseFrontendPlugin() | 47 | public BrowseFrontendPlugin() |
48 | { | 48 | { |
@@ -52,7 +52,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins | |||
52 | 52 | ||
53 | public void Initialise(AssetInventoryServer server) | 53 | public void Initialise(AssetInventoryServer server) |
54 | { | 54 | { |
55 | m_server = server; | 55 | //m_server = server; |
56 | 56 | ||
57 | // Request for / or /?... | 57 | // Request for / or /?... |
58 | //m_server.HttpServer.AddStreamHandler(new BrowseRequestHandler(server)); | 58 | //m_server.HttpServer.AddStreamHandler(new BrowseRequestHandler(server)); |
diff --git a/OpenSim/Grid/GridServer.Modules/GridMessagingModule.cs b/OpenSim/Grid/GridServer.Modules/GridMessagingModule.cs index c3b722c..8ae19a9 100644 --- a/OpenSim/Grid/GridServer.Modules/GridMessagingModule.cs +++ b/OpenSim/Grid/GridServer.Modules/GridMessagingModule.cs | |||
@@ -40,7 +40,7 @@ namespace OpenSim.Grid.GridServer.Modules | |||
40 | { | 40 | { |
41 | public class GridMessagingModule : IMessagingServerDiscovery | 41 | public class GridMessagingModule : IMessagingServerDiscovery |
42 | { | 42 | { |
43 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 43 | //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
44 | 44 | ||
45 | protected GridDBService m_gridDBService; | 45 | protected GridDBService m_gridDBService; |
46 | protected IGridServiceCore m_gridCore; | 46 | protected IGridServiceCore m_gridCore; |
@@ -50,7 +50,7 @@ namespace OpenSim.Grid.GridServer.Modules | |||
50 | /// <value> | 50 | /// <value> |
51 | /// Used to notify old regions as to which OpenSim version to upgrade to | 51 | /// Used to notify old regions as to which OpenSim version to upgrade to |
52 | /// </value> | 52 | /// </value> |
53 | private string m_opensimVersion; | 53 | //private string m_opensimVersion; |
54 | 54 | ||
55 | protected BaseHttpServer m_httpServer; | 55 | protected BaseHttpServer m_httpServer; |
56 | 56 | ||
@@ -63,7 +63,7 @@ namespace OpenSim.Grid.GridServer.Modules | |||
63 | 63 | ||
64 | public void Initialise(string opensimVersion, GridDBService gridDBService, IGridServiceCore gridCore, GridConfig config) | 64 | public void Initialise(string opensimVersion, GridDBService gridDBService, IGridServiceCore gridCore, GridConfig config) |
65 | { | 65 | { |
66 | m_opensimVersion = opensimVersion; | 66 | //m_opensimVersion = opensimVersion; |
67 | m_gridDBService = gridDBService; | 67 | m_gridDBService = gridDBService; |
68 | m_gridCore = gridCore; | 68 | m_gridCore = gridCore; |
69 | m_config = config; | 69 | m_config = config; |
diff --git a/OpenSim/Grid/GridServer.Modules/GridRestModule.cs b/OpenSim/Grid/GridServer.Modules/GridRestModule.cs index 95fa706..7df6514 100644 --- a/OpenSim/Grid/GridServer.Modules/GridRestModule.cs +++ b/OpenSim/Grid/GridServer.Modules/GridRestModule.cs | |||
@@ -53,7 +53,7 @@ namespace OpenSim.Grid.GridServer.Modules | |||
53 | /// <value> | 53 | /// <value> |
54 | /// Used to notify old regions as to which OpenSim version to upgrade to | 54 | /// Used to notify old regions as to which OpenSim version to upgrade to |
55 | /// </value> | 55 | /// </value> |
56 | private string m_opensimVersion; | 56 | //private string m_opensimVersion; |
57 | 57 | ||
58 | protected BaseHttpServer m_httpServer; | 58 | protected BaseHttpServer m_httpServer; |
59 | 59 | ||
@@ -69,7 +69,7 @@ namespace OpenSim.Grid.GridServer.Modules | |||
69 | 69 | ||
70 | public void Initialise(string opensimVersion, GridDBService gridDBService, IGridServiceCore gridCore, GridConfig config) | 70 | public void Initialise(string opensimVersion, GridDBService gridDBService, IGridServiceCore gridCore, GridConfig config) |
71 | { | 71 | { |
72 | m_opensimVersion = opensimVersion; | 72 | //m_opensimVersion = opensimVersion; |
73 | m_gridDBService = gridDBService; | 73 | m_gridDBService = gridDBService; |
74 | m_gridCore = gridCore; | 74 | m_gridCore = gridCore; |
75 | m_config = config; | 75 | m_config = config; |
diff --git a/OpenSim/Grid/UserServer.Modules/UserServerAvatarAppearanceModule.cs b/OpenSim/Grid/UserServer.Modules/UserServerAvatarAppearanceModule.cs index a5a630e..a53dee7 100644 --- a/OpenSim/Grid/UserServer.Modules/UserServerAvatarAppearanceModule.cs +++ b/OpenSim/Grid/UserServer.Modules/UserServerAvatarAppearanceModule.cs | |||
@@ -41,7 +41,7 @@ namespace OpenSim.Grid.UserServer.Modules | |||
41 | { | 41 | { |
42 | public class UserServerAvatarAppearanceModule | 42 | public class UserServerAvatarAppearanceModule |
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 | private UserDataBaseService m_userDataBaseService; | 46 | private UserDataBaseService m_userDataBaseService; |
47 | private BaseHttpServer m_httpServer; | 47 | private BaseHttpServer m_httpServer; |
diff --git a/OpenSim/Grid/UserServer.Modules/UserServerFriendsModule.cs b/OpenSim/Grid/UserServer.Modules/UserServerFriendsModule.cs index 49e94ee..8fc474f 100644 --- a/OpenSim/Grid/UserServer.Modules/UserServerFriendsModule.cs +++ b/OpenSim/Grid/UserServer.Modules/UserServerFriendsModule.cs | |||
@@ -41,7 +41,7 @@ namespace OpenSim.Grid.UserServer.Modules | |||
41 | { | 41 | { |
42 | public class UserServerFriendsModule | 42 | public class UserServerFriendsModule |
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 | private UserDataBaseService m_userDataBaseService; | 46 | private UserDataBaseService m_userDataBaseService; |
47 | 47 | ||
diff --git a/OpenSim/Grid/UserServer/UserServerCommandModule.cs b/OpenSim/Grid/UserServer/UserServerCommandModule.cs index 7f7108c..f73b3de 100644 --- a/OpenSim/Grid/UserServer/UserServerCommandModule.cs +++ b/OpenSim/Grid/UserServer/UserServerCommandModule.cs | |||
@@ -241,10 +241,12 @@ namespace OpenSim.Grid.UserServer | |||
241 | m_userDataBaseService.ResetUserPassword(firstName, lastName, newPassword); | 241 | m_userDataBaseService.ResetUserPassword(firstName, lastName, newPassword); |
242 | } | 242 | } |
243 | 243 | ||
244 | /* | ||
244 | private void HandleTestCommand(string module, string[] cmd) | 245 | private void HandleTestCommand(string module, string[] cmd) |
245 | { | 246 | { |
246 | m_log.Info("test command received"); | 247 | m_log.Info("test command received"); |
247 | } | 248 | } |
249 | */ | ||
248 | 250 | ||
249 | private void HandleLoginCommand(string module, string[] cmd) | 251 | private void HandleLoginCommand(string module, string[] cmd) |
250 | { | 252 | { |
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."; |