diff options
author | Justin Clark-Casey (justincc) | 2011-05-06 22:45:03 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-05-06 22:45:03 +0100 |
commit | 3d095e84d63e97e88bcb946498eba14de81705b4 (patch) | |
tree | 917e3940def04a76a462878908be571d1f68adfc /OpenSim | |
parent | remove obsolete [StandAlone] config section parsing, none of which was actual... (diff) | |
download | opensim-SC-3d095e84d63e97e88bcb946498eba14de81705b4.zip opensim-SC-3d095e84d63e97e88bcb946498eba14de81705b4.tar.gz opensim-SC-3d095e84d63e97e88bcb946498eba14de81705b4.tar.bz2 opensim-SC-3d095e84d63e97e88bcb946498eba14de81705b4.tar.xz |
minor: remove mono compiler warnings
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Data/SQLite/SQLiteAuthenticationData.cs | 4 | ||||
-rw-r--r-- | OpenSim/Data/SQLite/SQLiteAvatarData.cs | 2 | ||||
-rw-r--r-- | OpenSim/Framework/ChildAgentDataUpdate.cs | 2 | ||||
-rw-r--r-- | OpenSim/Framework/PriorityQueue.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs | 2 |
5 files changed, 5 insertions, 7 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteAuthenticationData.cs b/OpenSim/Data/SQLite/SQLiteAuthenticationData.cs index c54bd74..c3b65bb 100644 --- a/OpenSim/Data/SQLite/SQLiteAuthenticationData.cs +++ b/OpenSim/Data/SQLite/SQLiteAuthenticationData.cs | |||
@@ -33,7 +33,7 @@ using System.Reflection; | |||
33 | using log4net; | 33 | using log4net; |
34 | using OpenMetaverse; | 34 | using OpenMetaverse; |
35 | using OpenSim.Framework; | 35 | using OpenSim.Framework; |
36 | using log4net; | 36 | |
37 | #if CSharpSqlite | 37 | #if CSharpSqlite |
38 | using Community.CsharpSqlite.Sqlite; | 38 | using Community.CsharpSqlite.Sqlite; |
39 | #else | 39 | #else |
@@ -49,7 +49,6 @@ namespace OpenSim.Data.SQLite | |||
49 | private string m_Realm; | 49 | private string m_Realm; |
50 | private List<string> m_ColumnNames; | 50 | private List<string> m_ColumnNames; |
51 | private int m_LastExpire; | 51 | private int m_LastExpire; |
52 | private string m_connectionString; | ||
53 | 52 | ||
54 | protected static SqliteConnection m_Connection; | 53 | protected static SqliteConnection m_Connection; |
55 | private static bool m_initialized = false; | 54 | private static bool m_initialized = false; |
@@ -58,7 +57,6 @@ namespace OpenSim.Data.SQLite | |||
58 | : base(connectionString) | 57 | : base(connectionString) |
59 | { | 58 | { |
60 | m_Realm = realm; | 59 | m_Realm = realm; |
61 | m_connectionString = connectionString; | ||
62 | 60 | ||
63 | if (!m_initialized) | 61 | if (!m_initialized) |
64 | { | 62 | { |
diff --git a/OpenSim/Data/SQLite/SQLiteAvatarData.cs b/OpenSim/Data/SQLite/SQLiteAvatarData.cs index 60a1a3e..faf34da 100644 --- a/OpenSim/Data/SQLite/SQLiteAvatarData.cs +++ b/OpenSim/Data/SQLite/SQLiteAvatarData.cs | |||
@@ -47,7 +47,7 @@ namespace OpenSim.Data.SQLite | |||
47 | public class SQLiteAvatarData : SQLiteGenericTableHandler<AvatarBaseData>, | 47 | public class SQLiteAvatarData : SQLiteGenericTableHandler<AvatarBaseData>, |
48 | IAvatarData | 48 | IAvatarData |
49 | { | 49 | { |
50 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 50 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
51 | 51 | ||
52 | public SQLiteAvatarData(string connectionString, string realm) : | 52 | public SQLiteAvatarData(string connectionString, string realm) : |
53 | base(connectionString, realm, "Avatar") | 53 | base(connectionString, realm, "Avatar") |
diff --git a/OpenSim/Framework/ChildAgentDataUpdate.cs b/OpenSim/Framework/ChildAgentDataUpdate.cs index 28fe3ba..710a57d 100644 --- a/OpenSim/Framework/ChildAgentDataUpdate.cs +++ b/OpenSim/Framework/ChildAgentDataUpdate.cs | |||
@@ -460,7 +460,7 @@ namespace OpenSim.Framework | |||
460 | { | 460 | { |
461 | info["state"] = OSD.FromString(AttachmentObjectStates[i++]); | 461 | info["state"] = OSD.FromString(AttachmentObjectStates[i++]); |
462 | } | 462 | } |
463 | catch (IndexOutOfRangeException e) | 463 | catch (IndexOutOfRangeException) |
464 | { | 464 | { |
465 | m_log.WarnFormat("[CHILD AGENT DATA]: scripts list is shorter than object list."); | 465 | m_log.WarnFormat("[CHILD AGENT DATA]: scripts list is shorter than object list."); |
466 | } | 466 | } |
diff --git a/OpenSim/Framework/PriorityQueue.cs b/OpenSim/Framework/PriorityQueue.cs index 3e6fdaa..e7a7f7f 100644 --- a/OpenSim/Framework/PriorityQueue.cs +++ b/OpenSim/Framework/PriorityQueue.cs | |||
@@ -38,7 +38,7 @@ namespace OpenSim.Framework | |||
38 | { | 38 | { |
39 | public class PriorityQueue | 39 | public class PriorityQueue |
40 | { | 40 | { |
41 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 41 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
42 | 42 | ||
43 | public delegate bool UpdatePriorityHandler(ref uint priority, ISceneEntity entity); | 43 | public delegate bool UpdatePriorityHandler(ref uint priority, ISceneEntity entity); |
44 | 44 | ||
diff --git a/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs b/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs index 62e6fae..8f8124e 100644 --- a/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs +++ b/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs | |||
@@ -189,7 +189,7 @@ namespace OpenSim.Region.CoreModules.UDP.Linden | |||
189 | int maxNameLength = 18; | 189 | int maxNameLength = 18; |
190 | int maxRegionNameLength = 14; | 190 | int maxRegionNameLength = 14; |
191 | int maxTypeLength = 4; | 191 | int maxTypeLength = 4; |
192 | int totalInfoFieldsLength = maxNameLength + columnPadding + maxRegionNameLength + columnPadding + maxTypeLength + columnPadding; | 192 | // int totalInfoFieldsLength = maxNameLength + columnPadding + maxRegionNameLength + columnPadding + maxTypeLength + columnPadding; |
193 | 193 | ||
194 | report.Append(GetColumnEntry("User", maxNameLength, columnPadding)); | 194 | report.Append(GetColumnEntry("User", maxNameLength, columnPadding)); |
195 | report.Append(GetColumnEntry("Region", maxRegionNameLength, columnPadding)); | 195 | report.Append(GetColumnEntry("Region", maxRegionNameLength, columnPadding)); |