From 2e7c0d973ed28d732ea19762099ed3c55123780e Mon Sep 17 00:00:00 2001
From: Kyle Machulis <qdot@lindenlab.com>
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/llmessage/message.cpp | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'indra/llmessage/message.cpp')

diff --git a/indra/llmessage/message.cpp b/indra/llmessage/message.cpp
index e2cd19b264..d446730c33 100644
--- a/indra/llmessage/message.cpp
+++ b/indra/llmessage/message.cpp
@@ -1562,12 +1562,9 @@ U32 LLMessageSystem::getOurCircuitCode()
 	return mOurCircuitCode;
 }
 
-LLString LLMessageSystem::getCircuitInfoString()
+void LLMessageSystem::getCircuitInfo(LLSD& info) const
 {
-	LLString info_string;
-
-	info_string += mCircuitInfo.getInfoString();
-	return info_string;
+	mCircuitInfo.getInfo(info);
 }
 
 // returns whether the given host is on a trusted circuit
-- 
cgit v1.2.3