aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules
diff options
context:
space:
mode:
authorMelanie2013-04-25 00:22:28 +0100
committerMelanie2013-04-25 00:22:28 +0100
commitd36a52ea55ce85110353e7a7e0b3eeb0b2a3eb4a (patch)
treedc0becfcbb3e7edcea6cd4d679749394d4564254 /OpenSim/Region/OptionalModules
parentMerge branch 'master' into careminster (diff)
parentBulletSim: version of libBulletSim.so for 32 bit systems that doesn't (diff)
downloadopensim-SC_OLD-d36a52ea55ce85110353e7a7e0b3eeb0b2a3eb4a.zip
opensim-SC_OLD-d36a52ea55ce85110353e7a7e0b3eeb0b2a3eb4a.tar.gz
opensim-SC_OLD-d36a52ea55ce85110353e7a7e0b3eeb0b2a3eb4a.tar.bz2
opensim-SC_OLD-d36a52ea55ce85110353e7a7e0b3eeb0b2a3eb4a.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/OptionalModules')
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs6
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