aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/Communications/Capabilities/Caps.cs2
-rw-r--r--OpenSim/Framework/Console/LocalConsole.cs2
-rw-r--r--OpenSim/Framework/Console/RemoteConsole.cs8
-rw-r--r--OpenSim/Framework/Servers/CachedGetAssetStreamHandler.cs2
-rw-r--r--OpenSim/Framework/Servers/GetAssetStreamHandler.cs2
-rw-r--r--OpenSim/Framework/Servers/HttpServer/Tests/BaseRequestHandlerTests.cs3
-rw-r--r--OpenSim/Framework/Servers/Tests/CachedGetAssetStreamHandlerTests.cs3
-rw-r--r--OpenSim/Framework/Servers/Tests/GetAssetStreamHandlerTests.cs3
8 files changed, 14 insertions, 11 deletions
diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs
index 27395e3..9c59c89 100644
--- a/OpenSim/Framework/Communications/Capabilities/Caps.cs
+++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs
@@ -89,7 +89,7 @@ namespace OpenSim.Framework.Communications.Capabilities
89 //private static readonly string m_requestTexture = "0003/"; 89 //private static readonly string m_requestTexture = "0003/";
90 private static readonly string m_notecardUpdatePath = "0004/"; 90 private static readonly string m_notecardUpdatePath = "0004/";
91 private static readonly string m_notecardTaskUpdatePath = "0005/"; 91 private static readonly string m_notecardTaskUpdatePath = "0005/";
92 private static readonly string m_fetchInventoryPath = "0006/"; 92 // private static readonly string m_fetchInventoryPath = "0006/";
93 93
94 // The following entries are in a module, however, they are also here so that we don't re-assign 94 // The following entries are in a module, however, they are also here so that we don't re-assign
95 // the path to another cap by mistake. 95 // the path to another cap by mistake.
diff --git a/OpenSim/Framework/Console/LocalConsole.cs b/OpenSim/Framework/Console/LocalConsole.cs
index 4d768b9..c1ac9b3 100644
--- a/OpenSim/Framework/Console/LocalConsole.cs
+++ b/OpenSim/Framework/Console/LocalConsole.cs
@@ -42,7 +42,7 @@ namespace OpenSim.Framework.Console
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 private readonly object m_syncRoot = new object(); 45 // private readonly object m_syncRoot = new object();
46 46
47 private int y = -1; 47 private int y = -1;
48 private int cp = 0; 48 private int cp = 0;
diff --git a/OpenSim/Framework/Console/RemoteConsole.cs b/OpenSim/Framework/Console/RemoteConsole.cs
index 544a072..5a57a3c 100644
--- a/OpenSim/Framework/Console/RemoteConsole.cs
+++ b/OpenSim/Framework/Console/RemoteConsole.cs
@@ -43,8 +43,8 @@ namespace OpenSim.Framework.Console
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 IHttpServer m_Server = null; 46 // private IHttpServer m_Server = null;
47 private IConfigSource m_Config = null; 47 // private IConfigSource m_Config = null;
48 48
49 private List<string> m_Scrollback = new List<string>(); 49 private List<string> m_Scrollback = new List<string>();
50 private ManualResetEvent m_DataEvent = new ManualResetEvent(false); 50 private ManualResetEvent m_DataEvent = new ManualResetEvent(false);
@@ -57,12 +57,12 @@ namespace OpenSim.Framework.Console
57 57
58 public void ReadConfig(IConfigSource config) 58 public void ReadConfig(IConfigSource config)
59 { 59 {
60 m_Config = config; 60 // m_Config = config;
61 } 61 }
62 62
63 public void SetServer(IHttpServer server) 63 public void SetServer(IHttpServer server)
64 { 64 {
65 m_Server = server; 65 // m_Server = server;
66 } 66 }
67 67
68 public override void Output(string text, string level) 68 public override void Output(string text, string level)
diff --git a/OpenSim/Framework/Servers/CachedGetAssetStreamHandler.cs b/OpenSim/Framework/Servers/CachedGetAssetStreamHandler.cs
index ef637c5..adddf27 100644
--- a/OpenSim/Framework/Servers/CachedGetAssetStreamHandler.cs
+++ b/OpenSim/Framework/Servers/CachedGetAssetStreamHandler.cs
@@ -33,7 +33,7 @@ namespace OpenSim.Framework.Servers
33{ 33{
34 public class CachedGetAssetStreamHandler : BaseGetAssetStreamHandler 34 public class CachedGetAssetStreamHandler : BaseGetAssetStreamHandler
35 { 35 {
36 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 36 // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
37 37
38 private readonly IAssetCache m_assetProvider; 38 private readonly IAssetCache m_assetProvider;
39 39
diff --git a/OpenSim/Framework/Servers/GetAssetStreamHandler.cs b/OpenSim/Framework/Servers/GetAssetStreamHandler.cs
index a262e97..bc046cf 100644
--- a/OpenSim/Framework/Servers/GetAssetStreamHandler.cs
+++ b/OpenSim/Framework/Servers/GetAssetStreamHandler.cs
@@ -45,7 +45,7 @@ namespace OpenSim.Framework.Servers
45{ 45{
46 public class GetAssetStreamHandler : BaseGetAssetStreamHandler 46 public class GetAssetStreamHandler : BaseGetAssetStreamHandler
47 { 47 {
48 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 48 // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
49 49
50 private readonly IAssetDataPlugin m_assetProvider; 50 private readonly IAssetDataPlugin m_assetProvider;
51 51
diff --git a/OpenSim/Framework/Servers/HttpServer/Tests/BaseRequestHandlerTests.cs b/OpenSim/Framework/Servers/HttpServer/Tests/BaseRequestHandlerTests.cs
index 97c609c..29f66e6 100644
--- a/OpenSim/Framework/Servers/HttpServer/Tests/BaseRequestHandlerTests.cs
+++ b/OpenSim/Framework/Servers/HttpServer/Tests/BaseRequestHandlerTests.cs
@@ -48,7 +48,8 @@ namespace OpenSim.Framework.Servers.HttpServer.Tests
48 [Test] 48 [Test]
49 public void TestConstructor() 49 public void TestConstructor()
50 { 50 {
51 BaseRequestHandlerImpl handler = new BaseRequestHandlerImpl( null, null ); 51 // BaseRequestHandlerImpl handler =
52 new BaseRequestHandlerImpl( null, null );
52 } 53 }
53 54
54 [Test] 55 [Test]
diff --git a/OpenSim/Framework/Servers/Tests/CachedGetAssetStreamHandlerTests.cs b/OpenSim/Framework/Servers/Tests/CachedGetAssetStreamHandlerTests.cs
index b782a55..bc0b0b6 100644
--- a/OpenSim/Framework/Servers/Tests/CachedGetAssetStreamHandlerTests.cs
+++ b/OpenSim/Framework/Servers/Tests/CachedGetAssetStreamHandlerTests.cs
@@ -48,7 +48,8 @@ namespace OpenSim.Framework.Servers.Tests
48 { 48 {
49 TestHelper.InMethod(); 49 TestHelper.InMethod();
50 50
51 CachedGetAssetStreamHandler handler = new CachedGetAssetStreamHandler(null); 51 // CachedGetAssetStreamHandler handler =
52 new CachedGetAssetStreamHandler(null);
52 } 53 }
53 54
54 [Test] 55 [Test]
diff --git a/OpenSim/Framework/Servers/Tests/GetAssetStreamHandlerTests.cs b/OpenSim/Framework/Servers/Tests/GetAssetStreamHandlerTests.cs
index a9b7d3c..7a05f93 100644
--- a/OpenSim/Framework/Servers/Tests/GetAssetStreamHandlerTests.cs
+++ b/OpenSim/Framework/Servers/Tests/GetAssetStreamHandlerTests.cs
@@ -49,7 +49,8 @@ namespace OpenSim.Framework.Servers.Tests
49 { 49 {
50 TestHelper.InMethod(); 50 TestHelper.InMethod();
51 51
52 GetAssetStreamHandler handler = new GetAssetStreamHandler( null ); 52 // GetAssetStreamHandler handler =
53 new GetAssetStreamHandler( null );
53 } 54 }
54 55
55 [Test] 56 [Test]