summaryrefslogtreecommitdiff
path: root/indra/newview/llworld.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llworld.cpp')
-rw-r--r--indra/newview/llworld.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/llworld.cpp b/indra/newview/llworld.cpp
index 36be05fe7f..e76123557c 100644
--- a/indra/newview/llworld.cpp
+++ b/indra/newview/llworld.cpp
@@ -972,16 +972,16 @@ void LLWorld::requestCacheMisses()
}
}
-LLString LLWorld::getInfoString()
+void LLWorld::getInfo(LLSD& info)
{
- LLString info_string("World Info:\n");
+ LLSD region_info;
for (region_list_t::iterator iter = mRegionList.begin();
iter != mRegionList.end(); ++iter)
- {
+ {
LLViewerRegion* regionp = *iter;
- info_string += regionp->getInfoString();
+ regionp->getInfo(region_info);
+ info["World"].append(region_info);
}
- return info_string;
}
void LLWorld::disconnectRegions()