aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorUbitUmarov2018-01-03 10:48:38 +0000
committerUbitUmarov2018-01-03 10:48:38 +0000
commit3576d6d7644224531e225d4afea38c654fa0a4b0 (patch)
treeb031c3686c17022444d1d4dc5e2f2b1b715a3f99 /OpenSim/Region
parentfix merge (diff)
parentfix estates URI (diff)
downloadopensim-SC-3576d6d7644224531e225d4afea38c654fa0a4b0.zip
opensim-SC-3576d6d7644224531e225d4afea38c654fa0a4b0.tar.gz
opensim-SC-3576d6d7644224531e225d4afea38c654fa0a4b0.tar.bz2
opensim-SC-3576d6d7644224531e225d4afea38c654fa0a4b0.tar.xz
Merge branch 'master' into httptests
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/CoreModules/World/Estate/EstateConnector.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateConnector.cs b/OpenSim/Region/CoreModules/World/Estate/EstateConnector.cs
index 051ff71..8001c3c 100644
--- a/OpenSim/Region/CoreModules/World/Estate/EstateConnector.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateConnector.cs
@@ -192,12 +192,12 @@ namespace OpenSim.Region.CoreModules.World.Estate
192 { 192 {
193 string url = ""; 193 string url = "";
194 if(port != 0) 194 if(port != 0)
195 url = "http://" + region.ExternalHostName + ":" + port; 195 url = "http://" + region.ExternalHostName + ":" + port + "/";
196 else 196 else
197 url = region.ServerURI; 197 url = region.ServerURI;
198 198
199 string reply = SynchronousRestFormsRequester.MakeRequest("POST", 199 string reply = SynchronousRestFormsRequester.MakeRequest("POST",
200 url + "/estate", 200 url + "estate",
201 reqString); 201 reqString);
202 if (reply != string.Empty) 202 if (reply != string.Empty)
203 { 203 {