diff options
author | Justin Clarke Casey | 2009-03-06 21:00:15 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2009-03-06 21:00:15 +0000 |
commit | fc2c73d5c661cc28a037fd9217e8071159ff031f (patch) | |
tree | 3b8cc526c2539b7e84f0eb5ce585030886356038 | |
parent | * refactor: Remove GetLandOwner function from Scene (diff) | |
download | opensim-SC_OLD-fc2c73d5c661cc28a037fd9217e8071159ff031f.zip opensim-SC_OLD-fc2c73d5c661cc28a037fd9217e8071159ff031f.tar.gz opensim-SC_OLD-fc2c73d5c661cc28a037fd9217e8071159ff031f.tar.bz2 opensim-SC_OLD-fc2c73d5c661cc28a037fd9217e8071159ff031f.tar.xz |
* minor: remove some mono compiler warnings
-rw-r--r-- | OpenSim/Client/Linden/LLStandaloneLoginModule.cs | 2 | ||||
-rw-r--r-- | OpenSim/Client/MXP/ClientStack/MXPClientView.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/Application/ConfigurationLoader.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Application/OpenSimBase.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 7 |
5 files changed, 8 insertions, 9 deletions
diff --git a/OpenSim/Client/Linden/LLStandaloneLoginModule.cs b/OpenSim/Client/Linden/LLStandaloneLoginModule.cs index 686a621..11bb2c4 100644 --- a/OpenSim/Client/Linden/LLStandaloneLoginModule.cs +++ b/OpenSim/Client/Linden/LLStandaloneLoginModule.cs | |||
@@ -46,7 +46,7 @@ namespace OpenSim.Client.Linden | |||
46 | { | 46 | { |
47 | public class LLStandaloneLoginModule : IRegionModule, ILoginServiceToRegionsConnector | 47 | public class LLStandaloneLoginModule : IRegionModule, ILoginServiceToRegionsConnector |
48 | { | 48 | { |
49 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 49 | //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
50 | 50 | ||
51 | protected List<Scene> m_scenes = new List<Scene>(); | 51 | protected List<Scene> m_scenes = new List<Scene>(); |
52 | protected Scene m_firstScene; | 52 | protected Scene m_firstScene; |
diff --git a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs index 6f82478..383ae07 100644 --- a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs +++ b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs | |||
@@ -66,7 +66,7 @@ namespace OpenSim.Client.MXP.ClientStack | |||
66 | private readonly string m_lastName; | 66 | private readonly string m_lastName; |
67 | 67 | ||
68 | private Vector3 m_startPosition=new Vector3(128f, 128f, 128f); | 68 | private Vector3 m_startPosition=new Vector3(128f, 128f, 128f); |
69 | private int m_debugLevel; | 69 | //private int m_debugLevel; |
70 | #endregion | 70 | #endregion |
71 | 71 | ||
72 | #region Properties | 72 | #region Properties |
@@ -704,7 +704,7 @@ namespace OpenSim.Client.MXP.ClientStack | |||
704 | 704 | ||
705 | public void SetDebugPacketLevel(int newDebug) | 705 | public void SetDebugPacketLevel(int newDebug) |
706 | { | 706 | { |
707 | m_debugLevel = newDebug; | 707 | //m_debugLevel = newDebug; |
708 | } | 708 | } |
709 | 709 | ||
710 | public void InPacket(object NewPack) | 710 | public void InPacket(object NewPack) |
diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs index 799d7df..ac65e82 100644 --- a/OpenSim/Region/Application/ConfigurationLoader.cs +++ b/OpenSim/Region/Application/ConfigurationLoader.cs | |||
@@ -63,7 +63,7 @@ namespace OpenSim | |||
63 | string masterfilePath = Path.Combine(Util.configDir(), masterFileName); | 63 | string masterfilePath = Path.Combine(Util.configDir(), masterFileName); |
64 | 64 | ||
65 | string iniDirName = startupConfig.GetString("inidirectory", "config"); | 65 | string iniDirName = startupConfig.GetString("inidirectory", "config"); |
66 | string iniDirPath = Path.Combine(Util.configDir(), iniDirName); | 66 | //string iniDirPath = Path.Combine(Util.configDir(), iniDirName); |
67 | 67 | ||
68 | m_config = new OpenSimConfigSource(); | 68 | m_config = new OpenSimConfigSource(); |
69 | m_config.Source = new IniConfigSource(); | 69 | m_config.Source = new IniConfigSource(); |
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index 790dcb4..32b1258 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs | |||
@@ -188,8 +188,6 @@ namespace OpenSim | |||
188 | 188 | ||
189 | m_stats = StatsManager.StartCollectingSimExtraStats(); | 189 | m_stats = StatsManager.StartCollectingSimExtraStats(); |
190 | 190 | ||
191 | LibraryRootFolder libraryRootFolder = new LibraryRootFolder(m_configSettings.LibrariesXMLFile); | ||
192 | |||
193 | // Create a ModuleLoader instance | 191 | // Create a ModuleLoader instance |
194 | m_moduleLoader = new ModuleLoader(m_config.Source); | 192 | m_moduleLoader = new ModuleLoader(m_config.Source); |
195 | 193 | ||
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 67f6c29..7db9c07 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -98,7 +98,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
98 | 98 | ||
99 | private bool m_startAnimationSet = false; | 99 | private bool m_startAnimationSet = false; |
100 | 100 | ||
101 | private Vector3 m_requestedSitOffset = new Vector3(); | 101 | //private Vector3 m_requestedSitOffset = new Vector3(); |
102 | 102 | ||
103 | private Vector3 m_LastFinitePos = new Vector3(); | 103 | private Vector3 m_LastFinitePos = new Vector3(); |
104 | 104 | ||
@@ -1663,7 +1663,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1663 | m_nextSitAnimation = part.SitAnimation; | 1663 | m_nextSitAnimation = part.SitAnimation; |
1664 | } | 1664 | } |
1665 | m_requestedSitTargetID = part.LocalId; | 1665 | m_requestedSitTargetID = part.LocalId; |
1666 | m_requestedSitOffset = offset; | 1666 | //m_requestedSitOffset = offset; |
1667 | } | 1667 | } |
1668 | else | 1668 | else |
1669 | { | 1669 | { |
@@ -1693,12 +1693,13 @@ namespace OpenSim.Region.Framework.Scenes | |||
1693 | if (part != null) | 1693 | if (part != null) |
1694 | { | 1694 | { |
1695 | m_requestedSitTargetID = part.LocalId; | 1695 | m_requestedSitTargetID = part.LocalId; |
1696 | m_requestedSitOffset = offset; | 1696 | //m_requestedSitOffset = offset; |
1697 | } | 1697 | } |
1698 | else | 1698 | else |
1699 | { | 1699 | { |
1700 | m_log.Warn("Sit requested on unknown object: " + targetID.ToString()); | 1700 | m_log.Warn("Sit requested on unknown object: " + targetID.ToString()); |
1701 | } | 1701 | } |
1702 | |||
1702 | SendSitResponse(remoteClient, targetID, offset); | 1703 | SendSitResponse(remoteClient, targetID, offset); |
1703 | } | 1704 | } |
1704 | 1705 | ||