aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server/Handlers
diff options
context:
space:
mode:
authorOren Hurvitz2014-04-22 20:04:12 +0300
committerOren Hurvitz2014-04-23 16:37:36 +0300
commit998d7009a65def0a4debc9369d35b63611db5b55 (patch)
treed1303dc0387ae9ce4ddb076d5ccc856f3d5844e0 /OpenSim/Server/Handlers
parentWorkaround for SRAS: if Store Asset returns 'null' then assume the asset alre... (diff)
downloadopensim-SC_OLD-998d7009a65def0a4debc9369d35b63611db5b55.zip
opensim-SC_OLD-998d7009a65def0a4debc9369d35b63611db5b55.tar.gz
opensim-SC_OLD-998d7009a65def0a4debc9369d35b63611db5b55.tar.bz2
opensim-SC_OLD-998d7009a65def0a4debc9369d35b63611db5b55.tar.xz
Eliminated many warnings
Diffstat (limited to 'OpenSim/Server/Handlers')
-rw-r--r--OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs3
-rw-r--r--OpenSim/Server/Handlers/Profiles/UserProfilesConnector.cs5
2 files changed, 3 insertions, 5 deletions
diff --git a/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs b/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs
index 16d9b7d..37ca5a4 100644
--- a/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs
+++ b/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs
@@ -48,7 +48,10 @@ namespace OpenSim.Server.Handlers.Grid
48 public class GridServerPostHandler : BaseStreamHandler 48 public class GridServerPostHandler : BaseStreamHandler
49 { 49 {
50 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 50 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
51
52#pragma warning disable 414
51 private static string LogHeader = "[GRID HANDLER]"; 53 private static string LogHeader = "[GRID HANDLER]";
54#pragma warning restore 414
52 55
53 private IGridService m_GridService; 56 private IGridService m_GridService;
54 57
diff --git a/OpenSim/Server/Handlers/Profiles/UserProfilesConnector.cs b/OpenSim/Server/Handlers/Profiles/UserProfilesConnector.cs
index 6403882..2dfb862 100644
--- a/OpenSim/Server/Handlers/Profiles/UserProfilesConnector.cs
+++ b/OpenSim/Server/Handlers/Profiles/UserProfilesConnector.cs
@@ -53,11 +53,6 @@ namespace OpenSim.Server.Handlers.Profiles
53 get; private set; 53 get; private set;
54 } 54 }
55 55
56 public string ConfigName
57 {
58 get; private set;
59 }
60
61 public bool Enabled 56 public bool Enabled
62 { 57 {
63 get; private set; 58 get; private set;