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/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs index 6eb25ef..5541063 100644 --- a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs +++ b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs | |||
@@ -500,9 +500,9 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest | |||
500 | Request.Headers.Add(HttpCustomHeaders[i], | 500 | Request.Headers.Add(HttpCustomHeaders[i], |
501 | HttpCustomHeaders[i+1]); | 501 | HttpCustomHeaders[i+1]); |
502 | } | 502 | } |
503 | if (proxyurl != null && proxyurl.Length > 0) | 503 | if (!string.IsNullOrEmpty(proxyurl)) |
504 | { | 504 | { |
505 | if (proxyexcepts != null && proxyexcepts.Length > 0) | 505 | if (!string.IsNullOrEmpty(proxyexcepts)) |
506 | { | 506 | { |
507 | string[] elist = proxyexcepts.Split(';'); | 507 | string[] elist = proxyexcepts.Split(';'); |
508 | Request.Proxy = new WebProxy(proxyurl, true, elist); | 508 | Request.Proxy = new WebProxy(proxyurl, true, elist); |
@@ -520,7 +520,7 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest | |||
520 | Request.Headers[entry.Key] = entry.Value; | 520 | Request.Headers[entry.Key] = entry.Value; |
521 | 521 | ||
522 | // Encode outbound data | 522 | // Encode outbound data |
523 | if (OutboundBody.Length > 0) | 523 | if (!string.IsNullOrEmpty(OutboundBody)) |
524 | { | 524 | { |
525 | byte[] data = Util.UTF8.GetBytes(OutboundBody); | 525 | byte[] data = Util.UTF8.GetBytes(OutboundBody); |
526 | 526 | ||