diff options
Merge branch 'master' into careminster
Conflicts:
.gitignore
OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
prebuild.xml
runprebuild.bat
Diffstat (limited to 'OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice')
-rw-r--r-- | OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs index 349c0d0..b05482e 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs | |||
@@ -827,11 +827,11 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice | |||
827 | { | 827 | { |
828 | string requrl = String.Format(m_vivoxChannelPath, m_vivoxServer, "create", channelId, m_authToken); | 828 | string requrl = String.Format(m_vivoxChannelPath, m_vivoxServer, "create", channelId, m_authToken); |
829 | 829 | ||
830 | if (parent != null && parent != String.Empty) | 830 | if (!string.IsNullOrEmpty(parent)) |
831 | { | 831 | { |
832 | requrl = String.Format("{0}&chan_parent={1}", requrl, parent); | 832 | requrl = String.Format("{0}&chan_parent={1}", requrl, parent); |
833 | } | 833 | } |
834 | if (description != null && description != String.Empty) | 834 | if (!string.IsNullOrEmpty(description)) |
835 | { | 835 | { |
836 | requrl = String.Format("{0}&chan_desc={1}", requrl, description); | 836 | requrl = String.Format("{0}&chan_desc={1}", requrl, description); |
837 | } | 837 | } |
@@ -867,7 +867,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice | |||
867 | // requrl = String.Format("{0}&chan_parent={1}", requrl, parent); | 867 | // requrl = String.Format("{0}&chan_parent={1}", requrl, parent); |
868 | // } | 868 | // } |
869 | 869 | ||
870 | if (description != null && description != String.Empty) | 870 | if (!string.IsNullOrEmpty(description)) |
871 | { | 871 | { |
872 | requrl = String.Format("{0}&chan_desc={1}", requrl, description); | 872 | requrl = String.Format("{0}&chan_desc={1}", requrl, description); |
873 | } | 873 | } |
@@ -1053,7 +1053,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice | |||
1053 | private XmlElement VivoxDeleteChannel(string parent, string channelid) | 1053 | private XmlElement VivoxDeleteChannel(string parent, string channelid) |
1054 | { | 1054 | { |
1055 | string requrl = String.Format(m_vivoxChannelDel, m_vivoxServer, "delete", channelid, m_authToken); | 1055 | string requrl = String.Format(m_vivoxChannelDel, m_vivoxServer, "delete", channelid, m_authToken); |
1056 | if (parent != null && parent != String.Empty) | 1056 | if (!string.IsNullOrEmpty(parent)) |
1057 | { | 1057 | { |
1058 | requrl = String.Format("{0}&chan_parent={1}", requrl, parent); | 1058 | requrl = String.Format("{0}&chan_parent={1}", requrl, parent); |
1059 | } | 1059 | } |