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/llviewerregion.cpp | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) (limited to 'indra/newview/llviewerregion.cpp') diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp index 95a1db12df..5bfe023168 100644 --- a/indra/newview/llviewerregion.cpp +++ b/indra/newview/llviewerregion.cpp @@ -964,28 +964,16 @@ void LLViewerRegion::updateCoarseLocations(LLMessageSystem* msg) } } -LLString LLViewerRegion::getInfoString() +void LLViewerRegion::getInfo(LLSD& info) { - char tmp_buf[256]; /* Flawfinder: ignore */ - LLString info; - - info = "Region: "; - getHost().getString(tmp_buf, 256); - info += tmp_buf; - info += ":"; - info += getName(); - info += "\n"; - + info["Region"]["Host"] = getHost().getIPandPort(); + info["Region"]["Name"] = getName(); U32 x, y; from_region_handle(getHandle(), &x, &y); - snprintf(tmp_buf, sizeof(tmp_buf), "%d:%d", x, y); /* Flawfinder: ignore */ - info += "Handle:"; - info += tmp_buf; - info += "\n"; - return info; + info["Region"]["Handle"]["x"] = (LLSD::Integer)x; + info["Region"]["Handle"]["y"] = (LLSD::Integer)y; } - void LLViewerRegion::cacheFullUpdate(LLViewerObject* objectp, LLDataPackerBinaryBuffer &dp) { U32 local_id = objectp->getLocalID(); -- cgit v1.2.3