aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorUbitUmarov2017-05-20 17:56:04 +0100
committerUbitUmarov2017-05-20 17:56:04 +0100
commit49d42ee08afc1d01ccab3ce08f0daebf69c236cd (patch)
treee1208dca6b614452cd36c3a9ed2ca1db4bc035d7 /OpenSim/Region
parentmantis 8170: let physics know Always_run on adding the avatar (diff)
downloadopensim-SC_OLD-49d42ee08afc1d01ccab3ce08f0daebf69c236cd.zip
opensim-SC_OLD-49d42ee08afc1d01ccab3ce08f0daebf69c236cd.tar.gz
opensim-SC_OLD-49d42ee08afc1d01ccab3ce08f0daebf69c236cd.tar.bz2
opensim-SC_OLD-49d42ee08afc1d01ccab3ce08f0daebf69c236cd.tar.xz
mantis 8171 fix redirection on llHttpRequest
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs13
1 files changed, 2 insertions, 11 deletions
diff --git a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
index 035097f..ae5e175 100644
--- a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
+++ b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
@@ -663,12 +663,6 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
663 Status = (int)OSHttpStatusCode.ClientErrorJoker; 663 Status = (int)OSHttpStatusCode.ClientErrorJoker;
664 ResponseBody = e.Message; 664 ResponseBody = e.Message;
665 } 665 }
666
667 if (ResponseBody == null)
668 ResponseBody = String.Empty;
669
670 _finished = true;
671 return;
672 } 666 }
673 catch (Exception e) 667 catch (Exception e)
674 { 668 {
@@ -727,13 +721,10 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
727 else 721 else
728 { 722 {
729 _finished = true; 723 _finished = true;
724 if (ResponseBody == null)
725 ResponseBody = String.Empty;
730 } 726 }
731 } 727 }
732
733 if (ResponseBody == null)
734 ResponseBody = String.Empty;
735
736 _finished = true;
737 } 728 }
738 729
739 public void Stop() 730 public void Stop()