Second Life viewer sources 1.18.6.0-RC

1 files changed, 5 insertions, 18 deletions

diff --git a/linden/indra/newview/llviewerregion.cpp b/linden/indra/newview/llviewerregion.cpp
index 643df1e..0022212 100644
--- a/linden/indra/newview/llviewerregion.cpp
+++ b/linden/indra/newview/llviewerregion.cpp
@@ -63,7 +63,6 @@
 #include "llvocache.h"
 #include "llvoclouds.h"
 #include "llworld.h"
-#include "viewer.h"
 
 // Viewer object cache version, change if object update
 // format changes. JC
@@ -969,28 +968,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();