diff --git a/OpenSim/Client/Linden/LLStandaloneLoginModule.cs b/OpenSim/Client/Linden/LLStandaloneLoginModule.cs index 686a621331..11bb2c4b34 100644 --- a/OpenSim/Client/Linden/LLStandaloneLoginModule.cs +++ b/OpenSim/Client/Linden/LLStandaloneLoginModule.cs @@ -46,7 +46,7 @@ namespace OpenSim.Client.Linden { 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 m_scenes = new List(); protected Scene m_firstScene; diff --git a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs index 6f82478512..383ae07b20 100644 --- a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs +++ b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs @@ -66,7 +66,7 @@ namespace OpenSim.Client.MXP.ClientStack private readonly string m_lastName; private Vector3 m_startPosition=new Vector3(128f, 128f, 128f); - private int m_debugLevel; + //private int m_debugLevel; #endregion #region Properties @@ -704,7 +704,7 @@ namespace OpenSim.Client.MXP.ClientStack public void SetDebugPacketLevel(int newDebug) { - m_debugLevel = newDebug; + //m_debugLevel = newDebug; } public void InPacket(object NewPack) diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs index 799d7dfaec..ac65e82d22 100644 --- a/OpenSim/Region/Application/ConfigurationLoader.cs +++ b/OpenSim/Region/Application/ConfigurationLoader.cs @@ -63,7 +63,7 @@ namespace OpenSim string masterfilePath = Path.Combine(Util.configDir(), masterFileName); 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.Source = new IniConfigSource(); diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index 790dcb4972..32b1258322 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs @@ -188,8 +188,6 @@ namespace OpenSim m_stats = StatsManager.StartCollectingSimExtraStats(); - LibraryRootFolder libraryRootFolder = new LibraryRootFolder(m_configSettings.LibrariesXMLFile); - // Create a ModuleLoader instance m_moduleLoader = new ModuleLoader(m_config.Source); diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 67f6c29d7a..7db9c07801 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs @@ -98,7 +98,7 @@ namespace OpenSim.Region.Framework.Scenes private bool m_startAnimationSet = false; - private Vector3 m_requestedSitOffset = new Vector3(); + //private Vector3 m_requestedSitOffset = new Vector3(); private Vector3 m_LastFinitePos = new Vector3(); @@ -1663,7 +1663,7 @@ namespace OpenSim.Region.Framework.Scenes m_nextSitAnimation = part.SitAnimation; } m_requestedSitTargetID = part.LocalId; - m_requestedSitOffset = offset; + //m_requestedSitOffset = offset; } else { @@ -1693,12 +1693,13 @@ namespace OpenSim.Region.Framework.Scenes if (part != null) { m_requestedSitTargetID = part.LocalId; - m_requestedSitOffset = offset; + //m_requestedSitOffset = offset; } else { m_log.Warn("Sit requested on unknown object: " + targetID.ToString()); } + SendSitResponse(remoteClient, targetID, offset); }