From 998d7009a65def0a4debc9369d35b63611db5b55 Mon Sep 17 00:00:00 2001
From: Oren Hurvitz
Date: Tue, 22 Apr 2014 20:04:12 +0300
Subject: Eliminated many warnings

---
 .../Agent/InternetRelayClientView/Server/IRCClientView.cs             | 2 ++
 .../Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs             | 2 +-
 .../OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs       | 4 ++--
 OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStore.cs       | 2 +-
 OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreModule.cs | 4 +---
 OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs | 2 ++
 6 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'OpenSim/Region/OptionalModules')

diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
index c8320d0..e1aaf18 100644
--- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
+++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
@@ -1426,9 +1426,11 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
             return new byte[0];
         }
 
+#pragma warning disable 0067
         public event ViewerEffectEventHandler OnViewerEffect;
         public event Action<IClientAPI> OnLogout;
         public event Action<IClientAPI> OnConnectionClosed;
+#pragma warning restore 0067
 
         public void SendBlueBoxMessage(UUID FromAvatarID, string FromAvatarName, string Message)
         {
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
index 5a5a70c..45af212 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
@@ -65,7 +65,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
         // Capability string prefixes
         private static readonly string m_parcelVoiceInfoRequestPath = "0207/";
         private static readonly string m_provisionVoiceAccountRequestPath = "0208/";
-        private static readonly string m_chatSessionRequestPath = "0209/";
+        //private static readonly string m_chatSessionRequestPath = "0209/";
 
         // Control info
         private static bool   m_Enabled  = false;
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
index b4fae9d..dd44564 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
@@ -92,7 +92,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
         // Capability strings
         private static readonly string m_parcelVoiceInfoRequestPath = "0107/";
         private static readonly string m_provisionVoiceAccountRequestPath = "0108/";
-        private static readonly string m_chatSessionRequestPath = "0109/";
+        //private static readonly string m_chatSessionRequestPath = "0109/";
 
         // Control info, e.g. vivox server, admin user, admin password
         private static bool   m_pluginEnabled  = false;
@@ -1325,4 +1325,4 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
             return false;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStore.cs b/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStore.cs
index e498c6a..c38bb3e 100644
--- a/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStore.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStore.cs
@@ -276,7 +276,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
                 {
                     ovalue = OSDParser.DeserializeJson(value);
                 }
-                catch (Exception e)
+                catch (Exception)
                 {
                     if (value.StartsWith("'") && value.EndsWith("'"))
                     {
diff --git a/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreModule.cs b/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreModule.cs
index b502a55..26044f0 100644
--- a/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreModule.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreModule.cs
@@ -262,7 +262,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
             { 
                 map = new JsonStore(value);
             }
-            catch (Exception e)
+            catch (Exception)
             {
                 m_log.ErrorFormat("[JsonStore]: Unable to initialize store from {0}", value);
                 return false;
@@ -285,8 +285,6 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
 
             lock (m_JsonValueStore)
                 return m_JsonValueStore.Remove(storeID);
-            
-            return true;
         }
 
         // -----------------------------------------------------------------
diff --git a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
index 1345db9..4cd5676 100644
--- a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
+++ b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
@@ -103,7 +103,9 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
 
         #region IMoneyModule Members
 
+#pragma warning disable 0067
         public event ObjectPaid OnObjectPaid;
+#pragma warning restore 0067
 
         public int UploadCharge
         {
-- 
cgit v1.1