aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Scripting
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2013-11-15 21:45:08 +0000
committerJustin Clark-Casey (justincc)2013-11-15 21:45:08 +0000
commit7cab41f4223b7febd3fdd42fa7cfefef25e4a9c9 (patch)
tree24a0c3d086944436431ccae6302cd7cc0ffa8407 /OpenSim/Region/CoreModules/Scripting
parentIf a local land ID is given to the "land show" command, then output to consol... (diff)
downloadopensim-SC-7cab41f4223b7febd3fdd42fa7cfefef25e4a9c9.zip
opensim-SC-7cab41f4223b7febd3fdd42fa7cfefef25e4a9c9.tar.gz
opensim-SC-7cab41f4223b7febd3fdd42fa7cfefef25e4a9c9.tar.bz2
opensim-SC-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/CoreModules/Scripting')
-rw-r--r--OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs6
-rw-r--r--OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs4
-rw-r--r--OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs2
3 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
index 1a62405..c3a8afd 100644
--- a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
+++ b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
@@ -460,9 +460,9 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
460 Request.Headers.Add(HttpCustomHeaders[i], 460 Request.Headers.Add(HttpCustomHeaders[i],
461 HttpCustomHeaders[i+1]); 461 HttpCustomHeaders[i+1]);
462 } 462 }
463 if (proxyurl != null && proxyurl.Length > 0) 463 if (!string.IsNullOrEmpty(proxyurl))
464 { 464 {
465 if (proxyexcepts != null && proxyexcepts.Length > 0) 465 if (!string.IsNullOrEmpty(proxyexcepts))
466 { 466 {
467 string[] elist = proxyexcepts.Split(';'); 467 string[] elist = proxyexcepts.Split(';');
468 Request.Proxy = new WebProxy(proxyurl, true, elist); 468 Request.Proxy = new WebProxy(proxyurl, true, elist);
@@ -483,7 +483,7 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
483 } 483 }
484 484
485 // Encode outbound data 485 // Encode outbound data
486 if (OutboundBody != null && OutboundBody.Length > 0) 486 if (!string.IsNullOrEmpty(OutboundBody))
487 { 487 {
488 byte[] data = Util.UTF8.GetBytes(OutboundBody); 488 byte[] data = Util.UTF8.GetBytes(OutboundBody);
489 489
diff --git a/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs b/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs
index 65737fa..baf9f2f 100644
--- a/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs
@@ -161,9 +161,9 @@ namespace OpenSim.Region.CoreModules.Scripting.LoadImageURL
161 { 161 {
162 WebRequest request = HttpWebRequest.Create(url); 162 WebRequest request = HttpWebRequest.Create(url);
163 163
164 if (m_proxyurl != null && m_proxyurl.Length > 0) 164 if (!string.IsNullOrEmpty(m_proxyurl))
165 { 165 {
166 if (m_proxyexcepts != null && m_proxyexcepts.Length > 0) 166 if (!string.IsNullOrEmpty(m_proxyexcepts))
167 { 167 {
168 string[] elist = m_proxyexcepts.Split(';'); 168 string[] elist = m_proxyexcepts.Split(';');
169 request.Proxy = new WebProxy(m_proxyurl, true, elist); 169 request.Proxy = new WebProxy(m_proxyurl, true, elist);
diff --git a/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs b/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs
index cbffca7..c6e05b1 100644
--- a/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs
@@ -677,7 +677,7 @@ namespace OpenSim.Region.CoreModules.Scripting.XMLRPC
677 // if not, use as method name 677 // if not, use as method name
678 UUID parseUID; 678 UUID parseUID;
679 string mName = "llRemoteData"; 679 string mName = "llRemoteData";
680 if ((Channel != null) && (Channel != "")) 680 if (!string.IsNullOrEmpty(Channel))
681 if (!UUID.TryParse(Channel, out parseUID)) 681 if (!UUID.TryParse(Channel, out parseUID))
682 mName = Channel; 682 mName = Channel;
683 else 683 else