diff options
author | Melanie | 2012-02-07 23:30:48 +0000 |
---|---|---|
committer | Melanie | 2012-02-07 23:30:48 +0000 |
commit | 236e1c45f2f484aa97d5faae149dbc304608f592 (patch) | |
tree | f6bcc2b3ceae99a7789a5dc22e5fecfcfe8505e2 /OpenSim/Services/Connectors/Hypergrid | |
parent | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster (diff) | |
parent | Set UseMeshiesPhysicsMesh = true in [Mesh] by default (diff) | |
download | opensim-SC_OLD-236e1c45f2f484aa97d5faae149dbc304608f592.zip opensim-SC_OLD-236e1c45f2f484aa97d5faae149dbc304608f592.tar.gz opensim-SC_OLD-236e1c45f2f484aa97d5faae149dbc304608f592.tar.bz2 opensim-SC_OLD-236e1c45f2f484aa97d5faae149dbc304608f592.tar.xz |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Services/Connectors/Hypergrid')
-rw-r--r-- | OpenSim/Services/Connectors/Hypergrid/HGFriendsServiceConnector.cs | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/OpenSim/Services/Connectors/Hypergrid/HGFriendsServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/HGFriendsServiceConnector.cs index d699f59..af4b0da 100644 --- a/OpenSim/Services/Connectors/Hypergrid/HGFriendsServiceConnector.cs +++ b/OpenSim/Services/Connectors/Hypergrid/HGFriendsServiceConnector.cs | |||
@@ -79,11 +79,12 @@ namespace OpenSim.Services.Connectors.Hypergrid | |||
79 | sendData["SESSIONID"] = m_SessionID.ToString(); | 79 | sendData["SESSIONID"] = m_SessionID.ToString(); |
80 | 80 | ||
81 | string reqString = ServerUtils.BuildQueryString(sendData); | 81 | string reqString = ServerUtils.BuildQueryString(sendData); |
82 | string uri = m_ServerURI + "/hgfriends"; | ||
82 | 83 | ||
83 | try | 84 | try |
84 | { | 85 | { |
85 | string reply = SynchronousRestFormsRequester.MakeRequest("POST", | 86 | string reply = SynchronousRestFormsRequester.MakeRequest("POST", |
86 | m_ServerURI + "/hgfriends", | 87 | uri, |
87 | reqString); | 88 | reqString); |
88 | if (reply != string.Empty) | 89 | if (reply != string.Empty) |
89 | { | 90 | { |
@@ -103,7 +104,7 @@ namespace OpenSim.Services.Connectors.Hypergrid | |||
103 | } | 104 | } |
104 | catch (Exception e) | 105 | catch (Exception e) |
105 | { | 106 | { |
106 | m_log.DebugFormat("[HGFRIENDS CONNECTOR]: Exception when contacting friends server: {0}", e.Message); | 107 | m_log.DebugFormat("[HGFRIENDS CONNECTOR]: Exception when contacting friends server at {0}: {1}", uri, e.Message); |
107 | } | 108 | } |
108 | 109 | ||
109 | return 0; | 110 | return 0; |
@@ -123,15 +124,16 @@ namespace OpenSim.Services.Connectors.Hypergrid | |||
123 | sendData["SESSIONID"] = m_SessionID.ToString(); | 124 | sendData["SESSIONID"] = m_SessionID.ToString(); |
124 | 125 | ||
125 | string reply = string.Empty; | 126 | string reply = string.Empty; |
127 | string uri = m_ServerURI + "/hgfriends"; | ||
126 | try | 128 | try |
127 | { | 129 | { |
128 | reply = SynchronousRestFormsRequester.MakeRequest("POST", | 130 | reply = SynchronousRestFormsRequester.MakeRequest("POST", |
129 | m_ServerURI + "/hgfriends", | 131 | uri, |
130 | ServerUtils.BuildQueryString(sendData)); | 132 | ServerUtils.BuildQueryString(sendData)); |
131 | } | 133 | } |
132 | catch (Exception e) | 134 | catch (Exception e) |
133 | { | 135 | { |
134 | m_log.DebugFormat("[HGFRIENDS CONNECTOR]: Exception when contacting friends server: {0}", e.Message); | 136 | m_log.DebugFormat("[HGFRIENDS CONNECTOR]: Exception when contacting friends server at {0}: {1}", uri, e.Message); |
135 | return false; | 137 | return false; |
136 | } | 138 | } |
137 | 139 | ||
@@ -168,15 +170,16 @@ namespace OpenSim.Services.Connectors.Hypergrid | |||
168 | sendData["SECRET"] = secret; | 170 | sendData["SECRET"] = secret; |
169 | 171 | ||
170 | string reply = string.Empty; | 172 | string reply = string.Empty; |
173 | string uri = m_ServerURI + "/hgfriends"; | ||
171 | try | 174 | try |
172 | { | 175 | { |
173 | reply = SynchronousRestFormsRequester.MakeRequest("POST", | 176 | reply = SynchronousRestFormsRequester.MakeRequest("POST", |
174 | m_ServerURI + "/hgfriends", | 177 | uri, |
175 | ServerUtils.BuildQueryString(sendData)); | 178 | ServerUtils.BuildQueryString(sendData)); |
176 | } | 179 | } |
177 | catch (Exception e) | 180 | catch (Exception e) |
178 | { | 181 | { |
179 | m_log.DebugFormat("[HGFRIENDS CONNECTOR]: Exception when contacting friends server: {0}", e.Message); | 182 | m_log.DebugFormat("[HGFRIENDS CONNECTOR]: Exception when contacting friends server at {0}: {1}", uri, e.Message); |
180 | return false; | 183 | return false; |
181 | } | 184 | } |
182 | 185 | ||