OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* minor: remove some mono compiler warnings

0.6.2-post-fixes
Justin Clarke Casey 2009-01-13 18:35:20 +00:00
parent 363054bb2c
commit 1baa921463
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Data/NHibernate/NHibernateUserData.cs
View File

@ -118,6 +118,7 @@ namespace OpenSim.Data.NHibernate
} }
} }
/*
private void SetAgentData(UUID uuid, UserAgentData agent) private void SetAgentData(UUID uuid, UserAgentData agent)
{ {
UserAgentData old = (UserAgentData)manager.Load(typeof(UserAgentData), uuid); UserAgentData old = (UserAgentData)manager.Load(typeof(UserAgentData), uuid);
@ -131,8 +132,9 @@ namespace OpenSim.Data.NHibernate
m_log.InfoFormat("[NHIBERNATE] SetAgentData: {0} ", agent.ProfileID); m_log.InfoFormat("[NHIBERNATE] SetAgentData: {0} ", agent.ProfileID);
manager.Save(agent); manager.Save(agent);
} }
} }
*/
override public bool UpdateUserProfile(UserProfileData profile) override public bool UpdateUserProfile(UserProfileData profile)
{ {
if (ExistsUser(profile.ID)) if (ExistsUser(profile.ID))

2
OpenSim/Framework/Communications/Tests/LoginServiceTests.cs
View File

@ -212,7 +212,7 @@ namespace OpenSim.Framework.Communications.Tests
"If this is not the case please wait for your session to timeout. " + "If this is not the case please wait for your session to timeout. " +
"If this takes longer than a few minutes please contact the grid owner. " + "If this takes longer than a few minutes please contact the grid owner. " +
"Please wait 5 minutes if you are going to connect to a region nearby to the region you were at previously."; "Please wait 5 minutes if you are going to connect to a region nearby to the region you were at previously.";
string error_region_unavailable = "The region you are attempting to log into is not responding. Please select another region and try again."; //string error_region_unavailable = "The region you are attempting to log into is not responding. Please select another region and try again.";
// 2.1) Test for wrong user name // 2.1) Test for wrong user name
loginParams = new Hashtable(); loginParams = new Hashtable();
loginParams["first"] = lastName; loginParams["first"] = lastName;

6
OpenSim/Framework/RegionInfo.cs
View File

@ -199,7 +199,7 @@ namespace OpenSim.Framework
public bool isSandbox = false; public bool isSandbox = false;
private EstateSettings m_estateSettings; private EstateSettings m_estateSettings;
private RegionSettings m_regionSettings; private RegionSettings m_regionSettings;
private IConfigSource m_configSource = null; //private IConfigSource m_configSource = null;
public UUID MasterAvatarAssignedUUID = UUID.Zero; public UUID MasterAvatarAssignedUUID = UUID.Zero;
public string MasterAvatarFirstName = String.Empty; public string MasterAvatarFirstName = String.Empty;
@ -227,7 +227,7 @@ namespace OpenSim.Framework
public RegionInfo(string description, string filename, bool skipConsoleConfig, IConfigSource configSource) public RegionInfo(string description, string filename, bool skipConsoleConfig, IConfigSource configSource)
{ {
m_configSource = configSource; //m_configSource = configSource;
configMember = configMember =
new ConfigurationMember(filename, description, loadConfigurationOptions, handleIncomingConfiguration, !skipConsoleConfig); new ConfigurationMember(filename, description, loadConfigurationOptions, handleIncomingConfiguration, !skipConsoleConfig);
configMember.performConfigurationRetrieve(); configMember.performConfigurationRetrieve();
@ -236,7 +236,7 @@ namespace OpenSim.Framework
public RegionInfo(string description, XmlNode xmlNode, bool skipConsoleConfig, IConfigSource configSource) public RegionInfo(string description, XmlNode xmlNode, bool skipConsoleConfig, IConfigSource configSource)
{ {
m_configSource = configSource; //m_configSource = configSource;
configMember = configMember =
new ConfigurationMember(xmlNode, description, loadConfigurationOptions, handleIncomingConfiguration, !skipConsoleConfig); new ConfigurationMember(xmlNode, description, loadConfigurationOptions, handleIncomingConfiguration, !skipConsoleConfig);
configMember.performConfigurationRetrieve(); configMember.performConfigurationRetrieve();

2
OpenSim/Framework/Servers/BaseHttpServer.cs
View File

@ -1566,7 +1566,7 @@ namespace OpenSim.Framework.Servers
/// There is also a UseTraceLogs line in this file that can be uncommented for more detailed log information /// There is also a UseTraceLogs line in this file that can be uncommented for more detailed log information
public class HttpServerLogWriter : HttpServer.ILogWriter public class HttpServerLogWriter : HttpServer.ILogWriter
{ {
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
public void Write(object source, HttpServer.LogPrio priority, string message) public void Write(object source, HttpServer.LogPrio priority, string message)
{ {