diff options
author | Justin Clarke Casey | 2009-01-13 18:35:20 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2009-01-13 18:35:20 +0000 |
commit | 1baa921463712306ba339a073c9fad493176cea0 (patch) | |
tree | c2bc941679c37ffb9c6cbc7ec1228a304d6dce5e | |
parent | * minor; Very minor non-functional tidy ups (diff) | |
download | opensim-SC_OLD-1baa921463712306ba339a073c9fad493176cea0.zip opensim-SC_OLD-1baa921463712306ba339a073c9fad493176cea0.tar.gz opensim-SC_OLD-1baa921463712306ba339a073c9fad493176cea0.tar.bz2 opensim-SC_OLD-1baa921463712306ba339a073c9fad493176cea0.tar.xz |
* minor: remove some mono compiler warnings
-rw-r--r-- | OpenSim/Data/NHibernate/NHibernateUserData.cs | 4 | ||||
-rw-r--r-- | OpenSim/Framework/Communications/Tests/LoginServiceTests.cs | 2 | ||||
-rw-r--r-- | OpenSim/Framework/RegionInfo.cs | 6 | ||||
-rw-r--r-- | OpenSim/Framework/Servers/BaseHttpServer.cs | 2 |
4 files changed, 8 insertions, 6 deletions
diff --git a/OpenSim/Data/NHibernate/NHibernateUserData.cs b/OpenSim/Data/NHibernate/NHibernateUserData.cs index 6076f90..5c5cc92 100644 --- a/OpenSim/Data/NHibernate/NHibernateUserData.cs +++ b/OpenSim/Data/NHibernate/NHibernateUserData.cs | |||
@@ -118,6 +118,7 @@ namespace OpenSim.Data.NHibernate | |||
118 | } | 118 | } |
119 | } | 119 | } |
120 | 120 | ||
121 | /* | ||
121 | private void SetAgentData(UUID uuid, UserAgentData agent) | 122 | private void SetAgentData(UUID uuid, UserAgentData agent) |
122 | { | 123 | { |
123 | UserAgentData old = (UserAgentData)manager.Load(typeof(UserAgentData), uuid); | 124 | UserAgentData old = (UserAgentData)manager.Load(typeof(UserAgentData), uuid); |
@@ -131,8 +132,9 @@ namespace OpenSim.Data.NHibernate | |||
131 | m_log.InfoFormat("[NHIBERNATE] SetAgentData: {0} ", agent.ProfileID); | 132 | m_log.InfoFormat("[NHIBERNATE] SetAgentData: {0} ", agent.ProfileID); |
132 | manager.Save(agent); | 133 | manager.Save(agent); |
133 | } | 134 | } |
134 | |||
135 | } | 135 | } |
136 | */ | ||
137 | |||
136 | override public bool UpdateUserProfile(UserProfileData profile) | 138 | override public bool UpdateUserProfile(UserProfileData profile) |
137 | { | 139 | { |
138 | if (ExistsUser(profile.ID)) | 140 | if (ExistsUser(profile.ID)) |
diff --git a/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs b/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs index 8111add..ffa3c5f 100644 --- a/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs +++ b/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs | |||
@@ -212,7 +212,7 @@ namespace OpenSim.Framework.Communications.Tests | |||
212 | "If this is not the case please wait for your session to timeout. " + | 212 | "If this is not the case please wait for your session to timeout. " + |
213 | "If this takes longer than a few minutes please contact the grid owner. " + | 213 | "If this takes longer than a few minutes please contact the grid owner. " + |
214 | "Please wait 5 minutes if you are going to connect to a region nearby to the region you were at previously."; | 214 | "Please wait 5 minutes if you are going to connect to a region nearby to the region you were at previously."; |
215 | string error_region_unavailable = "The region you are attempting to log into is not responding. Please select another region and try again."; | 215 | //string error_region_unavailable = "The region you are attempting to log into is not responding. Please select another region and try again."; |
216 | // 2.1) Test for wrong user name | 216 | // 2.1) Test for wrong user name |
217 | loginParams = new Hashtable(); | 217 | loginParams = new Hashtable(); |
218 | loginParams["first"] = lastName; | 218 | loginParams["first"] = lastName; |
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs index 057f021..a0e5ba5 100644 --- a/OpenSim/Framework/RegionInfo.cs +++ b/OpenSim/Framework/RegionInfo.cs | |||
@@ -199,7 +199,7 @@ namespace OpenSim.Framework | |||
199 | public bool isSandbox = false; | 199 | public bool isSandbox = false; |
200 | private EstateSettings m_estateSettings; | 200 | private EstateSettings m_estateSettings; |
201 | private RegionSettings m_regionSettings; | 201 | private RegionSettings m_regionSettings; |
202 | private IConfigSource m_configSource = null; | 202 | //private IConfigSource m_configSource = null; |
203 | 203 | ||
204 | public UUID MasterAvatarAssignedUUID = UUID.Zero; | 204 | public UUID MasterAvatarAssignedUUID = UUID.Zero; |
205 | public string MasterAvatarFirstName = String.Empty; | 205 | public string MasterAvatarFirstName = String.Empty; |
@@ -227,7 +227,7 @@ namespace OpenSim.Framework | |||
227 | 227 | ||
228 | public RegionInfo(string description, string filename, bool skipConsoleConfig, IConfigSource configSource) | 228 | public RegionInfo(string description, string filename, bool skipConsoleConfig, IConfigSource configSource) |
229 | { | 229 | { |
230 | m_configSource = configSource; | 230 | //m_configSource = configSource; |
231 | configMember = | 231 | configMember = |
232 | new ConfigurationMember(filename, description, loadConfigurationOptions, handleIncomingConfiguration, !skipConsoleConfig); | 232 | new ConfigurationMember(filename, description, loadConfigurationOptions, handleIncomingConfiguration, !skipConsoleConfig); |
233 | configMember.performConfigurationRetrieve(); | 233 | configMember.performConfigurationRetrieve(); |
@@ -236,7 +236,7 @@ namespace OpenSim.Framework | |||
236 | 236 | ||
237 | public RegionInfo(string description, XmlNode xmlNode, bool skipConsoleConfig, IConfigSource configSource) | 237 | public RegionInfo(string description, XmlNode xmlNode, bool skipConsoleConfig, IConfigSource configSource) |
238 | { | 238 | { |
239 | m_configSource = configSource; | 239 | //m_configSource = configSource; |
240 | configMember = | 240 | configMember = |
241 | new ConfigurationMember(xmlNode, description, loadConfigurationOptions, handleIncomingConfiguration, !skipConsoleConfig); | 241 | new ConfigurationMember(xmlNode, description, loadConfigurationOptions, handleIncomingConfiguration, !skipConsoleConfig); |
242 | configMember.performConfigurationRetrieve(); | 242 | configMember.performConfigurationRetrieve(); |
diff --git a/OpenSim/Framework/Servers/BaseHttpServer.cs b/OpenSim/Framework/Servers/BaseHttpServer.cs index 09adc11..d69b2c0 100644 --- a/OpenSim/Framework/Servers/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/BaseHttpServer.cs | |||
@@ -1566,7 +1566,7 @@ namespace OpenSim.Framework.Servers | |||
1566 | /// There is also a UseTraceLogs line in this file that can be uncommented for more detailed log information | 1566 | /// There is also a UseTraceLogs line in this file that can be uncommented for more detailed log information |
1567 | public class HttpServerLogWriter : HttpServer.ILogWriter | 1567 | public class HttpServerLogWriter : HttpServer.ILogWriter |
1568 | { | 1568 | { |
1569 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 1569 | //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
1570 | 1570 | ||
1571 | public void Write(object source, HttpServer.LogPrio priority, string message) | 1571 | public void Write(object source, HttpServer.LogPrio priority, string message) |
1572 | { | 1572 | { |