diff options
author | Dr Scofield | 2009-01-26 21:34:44 +0000 |
---|---|---|
committer | Dr Scofield | 2009-01-26 21:34:44 +0000 |
commit | 10f7e534c931a7cdfa9bbc6995700310aadf07b2 (patch) | |
tree | 8a705e1b403c4a676d907d3905a53a51f580f0d3 /OpenSim/Region/Environment/Modules/Avatar/Concierge/ConciergeModule.cs | |
parent | ~ moving test server script on level up (diff) | |
download | opensim-SC_OLD-10f7e534c931a7cdfa9bbc6995700310aadf07b2.zip opensim-SC_OLD-10f7e534c931a7cdfa9bbc6995700310aadf07b2.tar.gz opensim-SC_OLD-10f7e534c931a7cdfa9bbc6995700310aadf07b2.tar.bz2 opensim-SC_OLD-10f7e534c931a7cdfa9bbc6995700310aadf07b2.tar.xz |
+ adding URI substitution for concierges broker URI
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Modules/Avatar/Concierge/ConciergeModule.cs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Concierge/ConciergeModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Concierge/ConciergeModule.cs index 297913e..2d1f381 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Concierge/ConciergeModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/Concierge/ConciergeModule.cs | |||
@@ -357,6 +357,8 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Concierge | |||
357 | if (String.IsNullOrEmpty(_brokerURI)) | 357 | if (String.IsNullOrEmpty(_brokerURI)) |
358 | return; | 358 | return; |
359 | 359 | ||
360 | string uri = String.Format(_brokerURI, scene.RegionInfo.RegionName, scene.RegionInfo.RegionID); | ||
361 | |||
360 | // get attendee list for the scene | 362 | // get attendee list for the scene |
361 | List<UUID> attendees; | 363 | List<UUID> attendees; |
362 | lock (_sceneAttendees) | 364 | lock (_sceneAttendees) |
@@ -394,7 +396,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Concierge | |||
394 | string payload = list.ToString(); | 396 | string payload = list.ToString(); |
395 | 397 | ||
396 | // post via REST to broker | 398 | // post via REST to broker |
397 | HttpWebRequest updatePost = WebRequest.Create(_brokerURI) as HttpWebRequest; | 399 | HttpWebRequest updatePost = WebRequest.Create(uri) as HttpWebRequest; |
398 | updatePost.Method = "POST"; | 400 | updatePost.Method = "POST"; |
399 | updatePost.ContentType = "text/xml"; | 401 | updatePost.ContentType = "text/xml"; |
400 | updatePost.ContentLength = payload.Length; | 402 | updatePost.ContentLength = payload.Length; |
@@ -405,7 +407,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Concierge | |||
405 | payloadStream.Close(); | 407 | payloadStream.Close(); |
406 | 408 | ||
407 | updatePost.BeginGetResponse(UpdateBrokerDone, updatePost); | 409 | updatePost.BeginGetResponse(UpdateBrokerDone, updatePost); |
408 | _log.DebugFormat("[Concierge] async broker update to {0} started", _brokerURI); | 410 | _log.DebugFormat("[Concierge] async broker update to {0} started", uri); |
409 | } | 411 | } |
410 | 412 | ||
411 | private void UpdateBrokerDone(IAsyncResult result) | 413 | private void UpdateBrokerDone(IAsyncResult result) |