From 2e7c0d973ed28d732ea19762099ed3c55123780e Mon Sep 17 00:00:00 2001 From: Kyle Machulis Date: Tue, 20 Nov 2007 23:42:48 +0000 Subject: svn merge -r74104:74124 svn+ssh://svn/svn/linden/branches/crash-logger-cleanup-merge-6 --- indra/newview/llworld.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'indra/newview/llworld.cpp') 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() -- cgit v1.2.3