diff options
Diffstat (limited to 'OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice')
-rw-r--r-- | OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs index e9c5453..7909d8a 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs | |||
@@ -92,7 +92,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice | |||
92 | private static string m_freeSwitchUrlResetPassword; | 92 | private static string m_freeSwitchUrlResetPassword; |
93 | private uint m_freeSwitchServicePort; | 93 | private uint m_freeSwitchServicePort; |
94 | private string m_openSimWellKnownHTTPAddress; | 94 | private string m_openSimWellKnownHTTPAddress; |
95 | private string m_freeSwitchContext; | 95 | // private string m_freeSwitchContext; |
96 | 96 | ||
97 | private readonly Dictionary<string, string> m_UUIDName = new Dictionary<string, string>(); | 97 | private readonly Dictionary<string, string> m_UUIDName = new Dictionary<string, string>(); |
98 | private Dictionary<string, string> m_ParcelAddress = new Dictionary<string, string>(); | 98 | private Dictionary<string, string> m_ParcelAddress = new Dictionary<string, string>(); |
@@ -106,16 +106,10 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice | |||
106 | m_Config = config.Configs["FreeSwitchVoice"]; | 106 | m_Config = config.Configs["FreeSwitchVoice"]; |
107 | 107 | ||
108 | if (m_Config == null) | 108 | if (m_Config == null) |
109 | { | ||
110 | m_log.Info("[FreeSwitchVoice] no config found, plugin disabled"); | ||
111 | return; | 109 | return; |
112 | } | ||
113 | 110 | ||
114 | if (!m_Config.GetBoolean("Enabled", false)) | 111 | if (!m_Config.GetBoolean("Enabled", false)) |
115 | { | ||
116 | m_log.Info("[FreeSwitchVoice] plugin disabled by configuration"); | ||
117 | return; | 112 | return; |
118 | } | ||
119 | 113 | ||
120 | try | 114 | try |
121 | { | 115 | { |
@@ -144,7 +138,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice | |||
144 | m_freeSwitchDefaultWellKnownIP = map["DefaultWellKnownIP"].AsString(); | 138 | m_freeSwitchDefaultWellKnownIP = map["DefaultWellKnownIP"].AsString(); |
145 | m_freeSwitchDefaultTimeout = map["DefaultTimeout"].AsInteger(); | 139 | m_freeSwitchDefaultTimeout = map["DefaultTimeout"].AsInteger(); |
146 | m_freeSwitchUrlResetPassword = String.Empty; | 140 | m_freeSwitchUrlResetPassword = String.Empty; |
147 | m_freeSwitchContext = map["Context"].AsString(); | 141 | // m_freeSwitchContext = map["Context"].AsString(); |
148 | 142 | ||
149 | if (String.IsNullOrEmpty(m_freeSwitchRealm) || | 143 | if (String.IsNullOrEmpty(m_freeSwitchRealm) || |
150 | String.IsNullOrEmpty(m_freeSwitchAPIPrefix)) | 144 | String.IsNullOrEmpty(m_freeSwitchAPIPrefix)) |
@@ -662,7 +656,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice | |||
662 | resp.Append("</buddies><groups></groups></body></level0></response>"); | 656 | resp.Append("</buddies><groups></groups></body></level0></response>"); |
663 | 657 | ||
664 | response["str_response_string"] = resp.ToString(); | 658 | response["str_response_string"] = resp.ToString(); |
665 | Regex normalizeEndLines = new Regex(@"\r\n", RegexOptions.Compiled | RegexOptions.Singleline | RegexOptions.Multiline); | 659 | // Regex normalizeEndLines = new Regex(@"\r\n", RegexOptions.Compiled | RegexOptions.Singleline | RegexOptions.Multiline); |
666 | 660 | ||
667 | //m_log.DebugFormat("[FREESWITCH]: {0}", normalizeEndLines.Replace((string)response["str_response_string"],"")); | 661 | //m_log.DebugFormat("[FREESWITCH]: {0}", normalizeEndLines.Replace((string)response["str_response_string"],"")); |
668 | return response; | 662 | return response; |
@@ -671,9 +665,9 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice | |||
671 | public Hashtable FreeSwitchSLVoiceSigninHTTPHandler(Hashtable request) | 665 | public Hashtable FreeSwitchSLVoiceSigninHTTPHandler(Hashtable request) |
672 | { | 666 | { |
673 | m_log.Debug("[FreeSwitchVoice] FreeSwitchSLVoiceSigninHTTPHandler called"); | 667 | m_log.Debug("[FreeSwitchVoice] FreeSwitchSLVoiceSigninHTTPHandler called"); |
674 | string requestbody = (string)request["body"]; | 668 | // string requestbody = (string)request["body"]; |
675 | string uri = (string)request["uri"]; | 669 | // string uri = (string)request["uri"]; |
676 | string contenttype = (string)request["content-type"]; | 670 | // string contenttype = (string)request["content-type"]; |
677 | 671 | ||
678 | Hashtable requestBody = ParseRequestBody((string)request["body"]); | 672 | Hashtable requestBody = ParseRequestBody((string)request["body"]); |
679 | 673 | ||