diff options
author | Justin Clark-Casey (justincc) | 2013-11-15 21:45:08 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2013-11-15 21:45:08 +0000 |
commit | 7cab41f4223b7febd3fdd42fa7cfefef25e4a9c9 (patch) | |
tree | 24a0c3d086944436431ccae6302cd7cc0ffa8407 /OpenSim/Region/OptionalModules/Avatar/Voice | |
parent | If a local land ID is given to the "land show" command, then output to consol... (diff) | |
download | opensim-SC_OLD-7cab41f4223b7febd3fdd42fa7cfefef25e4a9c9.zip opensim-SC_OLD-7cab41f4223b7febd3fdd42fa7cfefef25e4a9c9.tar.gz opensim-SC_OLD-7cab41f4223b7febd3fdd42fa7cfefef25e4a9c9.tar.bz2 opensim-SC_OLD-7cab41f4223b7febd3fdd42fa7cfefef25e4a9c9.tar.xz |
refactor: replace verbose checks with String.IsNullOrEmpty where applicable.
Thanks to Kira for this patch from http://opensimulator.org/mantis/view.php?id=6845
Diffstat (limited to 'OpenSim/Region/OptionalModules/Avatar/Voice')
-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 cdab116..b4fae9d 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs | |||
@@ -822,11 +822,11 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice | |||
822 | { | 822 | { |
823 | string requrl = String.Format(m_vivoxChannelPath, m_vivoxServer, "create", channelId, m_authToken); | 823 | string requrl = String.Format(m_vivoxChannelPath, m_vivoxServer, "create", channelId, m_authToken); |
824 | 824 | ||
825 | if (parent != null && parent != String.Empty) | 825 | if (!string.IsNullOrEmpty(parent)) |
826 | { | 826 | { |
827 | requrl = String.Format("{0}&chan_parent={1}", requrl, parent); | 827 | requrl = String.Format("{0}&chan_parent={1}", requrl, parent); |
828 | } | 828 | } |
829 | if (description != null && description != String.Empty) | 829 | if (!string.IsNullOrEmpty(description)) |
830 | { | 830 | { |
831 | requrl = String.Format("{0}&chan_desc={1}", requrl, description); | 831 | requrl = String.Format("{0}&chan_desc={1}", requrl, description); |
832 | } | 832 | } |
@@ -862,7 +862,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice | |||
862 | // requrl = String.Format("{0}&chan_parent={1}", requrl, parent); | 862 | // requrl = String.Format("{0}&chan_parent={1}", requrl, parent); |
863 | // } | 863 | // } |
864 | 864 | ||
865 | if (description != null && description != String.Empty) | 865 | if (!string.IsNullOrEmpty(description)) |
866 | { | 866 | { |
867 | requrl = String.Format("{0}&chan_desc={1}", requrl, description); | 867 | requrl = String.Format("{0}&chan_desc={1}", requrl, description); |
868 | } | 868 | } |
@@ -1047,7 +1047,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice | |||
1047 | private XmlElement VivoxDeleteChannel(string parent, string channelid) | 1047 | private XmlElement VivoxDeleteChannel(string parent, string channelid) |
1048 | { | 1048 | { |
1049 | string requrl = String.Format(m_vivoxChannelDel, m_vivoxServer, "delete", channelid, m_authToken); | 1049 | string requrl = String.Format(m_vivoxChannelDel, m_vivoxServer, "delete", channelid, m_authToken); |
1050 | if (parent != null && parent != String.Empty) | 1050 | if (!string.IsNullOrEmpty(parent)) |
1051 | { | 1051 | { |
1052 | requrl = String.Format("{0}&chan_parent={1}", requrl, parent); | 1052 | requrl = String.Format("{0}&chan_parent={1}", requrl, parent); |
1053 | } | 1053 | } |