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

* minor: remove some mono compiler warnings

0.6.4-rc1
Justin Clarke Casey 2009-03-06 21:00:15 +00:00
parent f12619b786
commit fc2c73d5c6
5 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Client/Linden/LLStandaloneLoginModule.cs
View File

@ -46,7 +46,7 @@ namespace OpenSim.Client.Linden
{ {
public class LLStandaloneLoginModule : IRegionModule, ILoginServiceToRegionsConnector public class LLStandaloneLoginModule : IRegionModule, ILoginServiceToRegionsConnector
{ {
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
protected List<Scene> m_scenes = new List<Scene>(); protected List<Scene> m_scenes = new List<Scene>();
protected Scene m_firstScene; protected Scene m_firstScene;

4
OpenSim/Client/MXP/ClientStack/MXPClientView.cs
View File

@ -66,7 +66,7 @@ namespace OpenSim.Client.MXP.ClientStack
private readonly string m_lastName; private readonly string m_lastName;
private Vector3 m_startPosition=new Vector3(128f, 128f, 128f); private Vector3 m_startPosition=new Vector3(128f, 128f, 128f);
private int m_debugLevel; //private int m_debugLevel;
#endregion #endregion
#region Properties #region Properties
@ -704,7 +704,7 @@ namespace OpenSim.Client.MXP.ClientStack
public void SetDebugPacketLevel(int newDebug) public void SetDebugPacketLevel(int newDebug)
{ {
m_debugLevel = newDebug; //m_debugLevel = newDebug;
} }
public void InPacket(object NewPack) public void InPacket(object NewPack)

2
OpenSim/Region/Application/ConfigurationLoader.cs
View File

@ -63,7 +63,7 @@ namespace OpenSim
string masterfilePath = Path.Combine(Util.configDir(), masterFileName); string masterfilePath = Path.Combine(Util.configDir(), masterFileName);
string iniDirName = startupConfig.GetString("inidirectory", "config"); string iniDirName = startupConfig.GetString("inidirectory", "config");
string iniDirPath = Path.Combine(Util.configDir(), iniDirName); //string iniDirPath = Path.Combine(Util.configDir(), iniDirName);
m_config = new OpenSimConfigSource(); m_config = new OpenSimConfigSource();
m_config.Source = new IniConfigSource(); m_config.Source = new IniConfigSource();

2
OpenSim/Region/Application/OpenSimBase.cs
View File

@ -188,8 +188,6 @@ namespace OpenSim
m_stats = StatsManager.StartCollectingSimExtraStats(); m_stats = StatsManager.StartCollectingSimExtraStats();
LibraryRootFolder libraryRootFolder = new LibraryRootFolder(m_configSettings.LibrariesXMLFile);
// Create a ModuleLoader instance // Create a ModuleLoader instance
m_moduleLoader = new ModuleLoader(m_config.Source); m_moduleLoader = new ModuleLoader(m_config.Source);

7
OpenSim/Region/Framework/Scenes/ScenePresence.cs
View File

@ -98,7 +98,7 @@ namespace OpenSim.Region.Framework.Scenes
private bool m_startAnimationSet = false; private bool m_startAnimationSet = false;
private Vector3 m_requestedSitOffset = new Vector3(); //private Vector3 m_requestedSitOffset = new Vector3();
private Vector3 m_LastFinitePos = new Vector3(); private Vector3 m_LastFinitePos = new Vector3();
@ -1663,7 +1663,7 @@ namespace OpenSim.Region.Framework.Scenes
m_nextSitAnimation = part.SitAnimation; m_nextSitAnimation = part.SitAnimation;
} }
m_requestedSitTargetID = part.LocalId; m_requestedSitTargetID = part.LocalId;
m_requestedSitOffset = offset; //m_requestedSitOffset = offset;
} }
else else
{ {
@ -1693,12 +1693,13 @@ namespace OpenSim.Region.Framework.Scenes
if (part != null) if (part != null)
{ {
m_requestedSitTargetID = part.LocalId; m_requestedSitTargetID = part.LocalId;
m_requestedSitOffset = offset; //m_requestedSitOffset = offset;
} }
else else
{ {
m_log.Warn("Sit requested on unknown object: " + targetID.ToString()); m_log.Warn("Sit requested on unknown object: " + targetID.ToString());
} }
SendSitResponse(remoteClient, targetID, offset); SendSitResponse(remoteClient, targetID, offset);
} }