aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs
diff options
context:
space:
mode:
authorMelanie2012-02-07 23:30:48 +0000
committerMelanie2012-02-07 23:30:48 +0000
commit236e1c45f2f484aa97d5faae149dbc304608f592 (patch)
treef6bcc2b3ceae99a7789a5dc22e5fecfcfe8505e2 /OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs
parentMerge branch 'master' of ssh://3dhosting.de/var/git/careminster (diff)
parentSet UseMeshiesPhysicsMesh = true in [Mesh] by default (diff)
downloadopensim-SC-236e1c45f2f484aa97d5faae149dbc304608f592.zip
opensim-SC-236e1c45f2f484aa97d5faae149dbc304608f592.tar.gz
opensim-SC-236e1c45f2f484aa97d5faae149dbc304608f592.tar.bz2
opensim-SC-236e1c45f2f484aa97d5faae149dbc304608f592.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs')
-rw-r--r--OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs9
1 files changed, 4 insertions, 5 deletions
diff --git a/OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs b/OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs
index d0a20fc..eea9853 100644
--- a/OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs
+++ b/OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs
@@ -139,12 +139,11 @@ namespace OpenSim.Services.Connectors.Friends
139 return false; 139 return false;
140 140
141 m_log.DebugFormat("[FRIENDS SIM CONNECTOR]: region: {0}", region.ExternalHostName + ":" + region.HttpPort); 141 m_log.DebugFormat("[FRIENDS SIM CONNECTOR]: region: {0}", region.ExternalHostName + ":" + region.HttpPort);
142 string uri = "http://" + region.ExternalHostName + ":" + region.HttpPort + "/friends";
143
142 try 144 try
143 { 145 {
144 string url = "http://" + region.ExternalHostName + ":" + region.HttpPort; 146 string reply = SynchronousRestFormsRequester.MakeRequest("POST", uri, reqString);
145 string reply = SynchronousRestFormsRequester.MakeRequest("POST",
146 url + "/friends",
147 reqString);
148 if (reply != string.Empty) 147 if (reply != string.Empty)
149 { 148 {
150 Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply); 149 Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
@@ -165,7 +164,7 @@ namespace OpenSim.Services.Connectors.Friends
165 } 164 }
166 catch (Exception e) 165 catch (Exception e)
167 { 166 {
168 m_log.DebugFormat("[FRIENDS SIM CONNECTOR]: Exception when contacting remote sim: {0}", e.ToString()); 167 m_log.DebugFormat("[FRIENDS SIM CONNECTOR]: Exception when contacting remote sim at {0}: {1}", uri, e.Message);
169 } 168 }
170 169
171 return false; 170 return false;