diff options
author | Justin Clark-Casey (justincc) | 2013-04-23 21:54:32 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2013-04-23 21:55:51 +0100 |
commit | 115e0aaf830d31530680b38afd705380be3f284a (patch) | |
tree | 7fb0468d62c31255cb7c8bc2e85b760a0f4c9598 /OpenSim/Region/OptionalModules/Avatar | |
parent | BulletSim: fix crash when deleting llVolumeDetect enabled objects. Bullet's c... (diff) | |
download | opensim-SC_OLD-115e0aaf830d31530680b38afd705380be3f284a.zip opensim-SC_OLD-115e0aaf830d31530680b38afd705380be3f284a.tar.gz opensim-SC_OLD-115e0aaf830d31530680b38afd705380be3f284a.tar.bz2 opensim-SC_OLD-115e0aaf830d31530680b38afd705380be3f284a.tar.xz |
Fix issue in ConciergeModule where UpdateBroker was sending malformed XML if any number of avatars other than 1 was in the region.
I don't know how well the rest of ConiergeModule works since I've practically never looked at this code.
Addresses http://opensimulator.org/mantis/view.php?id=6605
Diffstat (limited to 'OpenSim/Region/OptionalModules/Avatar')
-rw-r--r-- | OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs b/OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs index 018357a..c48e585 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs | |||
@@ -375,11 +375,13 @@ namespace OpenSim.Region.OptionalModules.Avatar.Concierge | |||
375 | scene.GetRootAgentCount(), scene.RegionInfo.RegionName, | 375 | scene.GetRootAgentCount(), scene.RegionInfo.RegionName, |
376 | scene.RegionInfo.RegionID, | 376 | scene.RegionInfo.RegionID, |
377 | DateTime.UtcNow.ToString("s"))); | 377 | DateTime.UtcNow.ToString("s"))); |
378 | |||
378 | scene.ForEachRootScenePresence(delegate(ScenePresence sp) | 379 | scene.ForEachRootScenePresence(delegate(ScenePresence sp) |
379 | { | 380 | { |
380 | list.Append(String.Format(" <avatar name=\"{0}\" uuid=\"{1}\" />\n", sp.Name, sp.UUID)); | 381 | list.Append(String.Format(" <avatar name=\"{0}\" uuid=\"{1}\" />\n", sp.Name, sp.UUID)); |
381 | list.Append("</avatars>"); | ||
382 | }); | 382 | }); |
383 | |||
384 | list.Append("</avatars>"); | ||
383 | string payload = list.ToString(); | 385 | string payload = list.ToString(); |
384 | 386 | ||
385 | // post via REST to broker | 387 | // post via REST to broker |