diff options
Diffstat (limited to 'OpenSim/Region/OptionalModules')
6 files changed, 9 insertions, 7 deletions
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 | |||
1426 | return new byte[0]; | 1426 | return new byte[0]; |
1427 | } | 1427 | } |
1428 | 1428 | ||
1429 | #pragma warning disable 0067 | ||
1429 | public event ViewerEffectEventHandler OnViewerEffect; | 1430 | public event ViewerEffectEventHandler OnViewerEffect; |
1430 | public event Action<IClientAPI> OnLogout; | 1431 | public event Action<IClientAPI> OnLogout; |
1431 | public event Action<IClientAPI> OnConnectionClosed; | 1432 | public event Action<IClientAPI> OnConnectionClosed; |
1433 | #pragma warning restore 0067 | ||
1432 | 1434 | ||
1433 | public void SendBlueBoxMessage(UUID FromAvatarID, string FromAvatarName, string Message) | 1435 | public void SendBlueBoxMessage(UUID FromAvatarID, string FromAvatarName, string Message) |
1434 | { | 1436 | { |
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 | |||
65 | // Capability string prefixes | 65 | // Capability string prefixes |
66 | private static readonly string m_parcelVoiceInfoRequestPath = "0207/"; | 66 | private static readonly string m_parcelVoiceInfoRequestPath = "0207/"; |
67 | private static readonly string m_provisionVoiceAccountRequestPath = "0208/"; | 67 | private static readonly string m_provisionVoiceAccountRequestPath = "0208/"; |
68 | private static readonly string m_chatSessionRequestPath = "0209/"; | 68 | //private static readonly string m_chatSessionRequestPath = "0209/"; |
69 | 69 | ||
70 | // Control info | 70 | // Control info |
71 | private static bool m_Enabled = false; | 71 | 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 | |||
92 | // Capability strings | 92 | // Capability strings |
93 | private static readonly string m_parcelVoiceInfoRequestPath = "0107/"; | 93 | private static readonly string m_parcelVoiceInfoRequestPath = "0107/"; |
94 | private static readonly string m_provisionVoiceAccountRequestPath = "0108/"; | 94 | private static readonly string m_provisionVoiceAccountRequestPath = "0108/"; |
95 | private static readonly string m_chatSessionRequestPath = "0109/"; | 95 | //private static readonly string m_chatSessionRequestPath = "0109/"; |
96 | 96 | ||
97 | // Control info, e.g. vivox server, admin user, admin password | 97 | // Control info, e.g. vivox server, admin user, admin password |
98 | private static bool m_pluginEnabled = false; | 98 | private static bool m_pluginEnabled = false; |
@@ -1325,4 +1325,4 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice | |||
1325 | return false; | 1325 | return false; |
1326 | } | 1326 | } |
1327 | } | 1327 | } |
1328 | } \ No newline at end of file | 1328 | } |
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 | |||
276 | { | 276 | { |
277 | ovalue = OSDParser.DeserializeJson(value); | 277 | ovalue = OSDParser.DeserializeJson(value); |
278 | } | 278 | } |
279 | catch (Exception e) | 279 | catch (Exception) |
280 | { | 280 | { |
281 | if (value.StartsWith("'") && value.EndsWith("'")) | 281 | if (value.StartsWith("'") && value.EndsWith("'")) |
282 | { | 282 | { |
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 | |||
262 | { | 262 | { |
263 | map = new JsonStore(value); | 263 | map = new JsonStore(value); |
264 | } | 264 | } |
265 | catch (Exception e) | 265 | catch (Exception) |
266 | { | 266 | { |
267 | m_log.ErrorFormat("[JsonStore]: Unable to initialize store from {0}", value); | 267 | m_log.ErrorFormat("[JsonStore]: Unable to initialize store from {0}", value); |
268 | return false; | 268 | return false; |
@@ -285,8 +285,6 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore | |||
285 | 285 | ||
286 | lock (m_JsonValueStore) | 286 | lock (m_JsonValueStore) |
287 | return m_JsonValueStore.Remove(storeID); | 287 | return m_JsonValueStore.Remove(storeID); |
288 | |||
289 | return true; | ||
290 | } | 288 | } |
291 | 289 | ||
292 | // ----------------------------------------------------------------- | 290 | // ----------------------------------------------------------------- |
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 | |||
103 | 103 | ||
104 | #region IMoneyModule Members | 104 | #region IMoneyModule Members |
105 | 105 | ||
106 | #pragma warning disable 0067 | ||
106 | public event ObjectPaid OnObjectPaid; | 107 | public event ObjectPaid OnObjectPaid; |
108 | #pragma warning restore 0067 | ||
107 | 109 | ||
108 | public int UploadCharge | 110 | public int UploadCharge |
109 | { | 111 | { |