diff options
Diffstat (limited to 'OpenSim/Region/OptionalModules')
3 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs b/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs index dfeecb1..6a24cc1 100644 --- a/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs +++ b/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs | |||
@@ -51,7 +51,7 @@ namespace OpenSim.Region.CoreModules.UDP.Linden | |||
51 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "LindenUDPInfoModule")] | 51 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "LindenUDPInfoModule")] |
52 | public class LindenUDPInfoModule : ISharedRegionModule | 52 | public class LindenUDPInfoModule : ISharedRegionModule |
53 | { | 53 | { |
54 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 54 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
55 | 55 | ||
56 | protected Dictionary<UUID, Scene> m_scenes = new Dictionary<UUID, Scene>(); | 56 | protected Dictionary<UUID, Scene> m_scenes = new Dictionary<UUID, Scene>(); |
57 | 57 | ||
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs index e9c5453..05a1c3b 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>(); |
@@ -144,7 +144,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice | |||
144 | m_freeSwitchDefaultWellKnownIP = map["DefaultWellKnownIP"].AsString(); | 144 | m_freeSwitchDefaultWellKnownIP = map["DefaultWellKnownIP"].AsString(); |
145 | m_freeSwitchDefaultTimeout = map["DefaultTimeout"].AsInteger(); | 145 | m_freeSwitchDefaultTimeout = map["DefaultTimeout"].AsInteger(); |
146 | m_freeSwitchUrlResetPassword = String.Empty; | 146 | m_freeSwitchUrlResetPassword = String.Empty; |
147 | m_freeSwitchContext = map["Context"].AsString(); | 147 | // m_freeSwitchContext = map["Context"].AsString(); |
148 | 148 | ||
149 | if (String.IsNullOrEmpty(m_freeSwitchRealm) || | 149 | if (String.IsNullOrEmpty(m_freeSwitchRealm) || |
150 | String.IsNullOrEmpty(m_freeSwitchAPIPrefix)) | 150 | String.IsNullOrEmpty(m_freeSwitchAPIPrefix)) |
@@ -662,7 +662,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice | |||
662 | resp.Append("</buddies><groups></groups></body></level0></response>"); | 662 | resp.Append("</buddies><groups></groups></body></level0></response>"); |
663 | 663 | ||
664 | response["str_response_string"] = resp.ToString(); | 664 | response["str_response_string"] = resp.ToString(); |
665 | Regex normalizeEndLines = new Regex(@"\r\n", RegexOptions.Compiled | RegexOptions.Singleline | RegexOptions.Multiline); | 665 | // Regex normalizeEndLines = new Regex(@"\r\n", RegexOptions.Compiled | RegexOptions.Singleline | RegexOptions.Multiline); |
666 | 666 | ||
667 | //m_log.DebugFormat("[FREESWITCH]: {0}", normalizeEndLines.Replace((string)response["str_response_string"],"")); | 667 | //m_log.DebugFormat("[FREESWITCH]: {0}", normalizeEndLines.Replace((string)response["str_response_string"],"")); |
668 | return response; | 668 | return response; |
@@ -671,9 +671,9 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice | |||
671 | public Hashtable FreeSwitchSLVoiceSigninHTTPHandler(Hashtable request) | 671 | public Hashtable FreeSwitchSLVoiceSigninHTTPHandler(Hashtable request) |
672 | { | 672 | { |
673 | m_log.Debug("[FreeSwitchVoice] FreeSwitchSLVoiceSigninHTTPHandler called"); | 673 | m_log.Debug("[FreeSwitchVoice] FreeSwitchSLVoiceSigninHTTPHandler called"); |
674 | string requestbody = (string)request["body"]; | 674 | // string requestbody = (string)request["body"]; |
675 | string uri = (string)request["uri"]; | 675 | // string uri = (string)request["uri"]; |
676 | string contenttype = (string)request["content-type"]; | 676 | // string contenttype = (string)request["content-type"]; |
677 | 677 | ||
678 | Hashtable requestBody = ParseRequestBody((string)request["body"]); | 678 | Hashtable requestBody = ParseRequestBody((string)request["body"]); |
679 | 679 | ||
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/SimianGroupsServicesConnectorModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/SimianGroupsServicesConnectorModule.cs index 81725c5..02751ea 100644 --- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/SimianGroupsServicesConnectorModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/SimianGroupsServicesConnectorModule.cs | |||
@@ -712,7 +712,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
712 | if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR] {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); | 712 | if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR] {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); |
713 | 713 | ||
714 | GroupMembershipData data = null; | 714 | GroupMembershipData data = null; |
715 | bool foundData = false; | 715 | // bool foundData = false; |
716 | 716 | ||
717 | OSDMap UserGroupMemberInfo; | 717 | OSDMap UserGroupMemberInfo; |
718 | if (SimianGetGenericEntry(agentID, "GroupMember", groupID.ToString(), out UserGroupMemberInfo)) | 718 | if (SimianGetGenericEntry(agentID, "GroupMember", groupID.ToString(), out UserGroupMemberInfo)) |