diff options
| author | Kyle Machulis <qdot@lindenlab.com> | 2007-11-20 23:42:48 +0000 |
|---|---|---|
| committer | Kyle Machulis <qdot@lindenlab.com> | 2007-11-20 23:42:48 +0000 |
| commit | 2e7c0d973ed28d732ea19762099ed3c55123780e (patch) | |
| tree | 36b04301d325e07075880a8a64166c5284d1d61f /indra/llmessage/message.cpp | |
| parent | 5356b917545d43df5537128245ee5b786b705b90 (diff) | |
svn merge -r74104:74124 svn+ssh://svn/svn/linden/branches/crash-logger-cleanup-merge-6
Diffstat (limited to 'indra/llmessage/message.cpp')
| -rw-r--r-- | indra/llmessage/message.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
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 |