aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs22
1 files changed, 20 insertions, 2 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
index 5070ecc..d5f3b4a 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
@@ -930,26 +930,41 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
930 string parent; 930 string parent;
931 931
932 // skip if not a channel 932 // skip if not a channel
933 if (!XmlFind(resp, "response.level0.channel-search.channels.channels.level4.type", i, out type) || 933 if (!XmlFind(resp, "response.level0.channel-search.channels.channels.level4.type", i, out type) ||
934 (type != "channel" && type != "positional_M")) 934 (type != "channel" && type != "positional_M"))
935 {
936 m_log.Debug("[VivoxVoice] Skipping Channel " + i + " as it's not a channel.");
935 continue; 937 continue;
938 }
936 939
937 // skip if not the name we are looking for 940 // skip if not the name we are looking for
938 if (!XmlFind(resp, "response.level0.channel-search.channels.channels.level4.name", i, out name) || 941 if (!XmlFind(resp, "response.level0.channel-search.channels.channels.level4.name", i, out name) ||
939 name != channelName) 942 name != channelName)
943 {
944 m_log.Debug("[VivoxVoice] Skipping Channel " + i + " as it has no name.");
940 continue; 945 continue;
946 }
941 947
942 // skip if parent does not match 948 // skip if parent does not match
943 if (channelParent != null && !XmlFind(resp, "response.level0.channel-search.channels.channels.level4.parent", i, out parent)) 949 if (channelParent != null && !XmlFind(resp, "response.level0.channel-search.channels.channels.level4.parent", i, out parent))
950 {
951 m_log.Debug("[VivoxVoice] Skipping Channel " + i + "/" + name + " as it's parent doesnt match");
944 continue; 952 continue;
953 }
945 954
946 // skip if no channel id available 955 // skip if no channel id available
947 if (!XmlFind(resp, "response.level0.channel-search.channels.channels.level4.id", i, out id)) 956 if (!XmlFind(resp, "response.level0.channel-search.channels.channels.level4.id", i, out id))
957 {
958 m_log.Debug("[VivoxVoice] Skipping Channel " + i + "/" + name + " as it has no channel ID");
948 continue; 959 continue;
960 }
949 961
950 // skip if no channel uri available 962 // skip if no channel uri available
951 if (!XmlFind(resp, "response.level0.channel-search.channels.channels.level4.uri", i, out uri)) 963 if (!XmlFind(resp, "response.level0.channel-search.channels.channels.level4.uri", i, out uri))
964 {
965 m_log.Debug("[VivoxVoice] Skipping Channel " + i + "/" + name + " as it has no channel URI");
952 continue; 966 continue;
967 }
953 968
954 channelId = id; 969 channelId = id;
955 channelUri = uri; 970 channelUri = uri;
@@ -961,7 +976,10 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
961 channelId = String.Empty; 976 channelId = String.Empty;
962 channelUri = String.Empty; 977 channelUri = String.Empty;
963 978
964 m_log.Debug("[VivoxVoice] Could not find channel in XMLRESP: " + resp); 979 XmlDocument tmpDoc = new XmlDocument();
980 tmpDoc.AppendChild(resp);
981
982 m_log.Debug("[VivoxVoice] Could not find channel in XMLRESP: " + tmpDoc.InnerText);
965 983
966 return false; 984 return false;
967 } 985 }