diff options
| author | Jacek Antonelli | 2008-08-15 23:45:19 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2008-08-15 23:45:19 -0500 |
| commit | b235c59d60472f818a9142c0886b95a0ff4191d7 (patch) | |
| tree | d323c55587584b19cc43a03f58a178823f12d3cd /linden/indra/llmessage/message.cpp | |
| parent | Second Life viewer sources 1.18.5.3 (diff) | |
| download | meta-impy-b235c59d60472f818a9142c0886b95a0ff4191d7.zip meta-impy-b235c59d60472f818a9142c0886b95a0ff4191d7.tar.gz meta-impy-b235c59d60472f818a9142c0886b95a0ff4191d7.tar.bz2 meta-impy-b235c59d60472f818a9142c0886b95a0ff4191d7.tar.xz | |
Second Life viewer sources 1.18.6.0-RC
Diffstat (limited to '')
| -rw-r--r-- | linden/indra/llmessage/message.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/linden/indra/llmessage/message.cpp b/linden/indra/llmessage/message.cpp index e2cd19b..d446730 100644 --- a/linden/indra/llmessage/message.cpp +++ b/linden/indra/llmessage/message.cpp | |||
| @@ -1562,12 +1562,9 @@ U32 LLMessageSystem::getOurCircuitCode() | |||
| 1562 | return mOurCircuitCode; | 1562 | return mOurCircuitCode; |
| 1563 | } | 1563 | } |
| 1564 | 1564 | ||
| 1565 | LLString LLMessageSystem::getCircuitInfoString() | 1565 | void LLMessageSystem::getCircuitInfo(LLSD& info) const |
| 1566 | { | 1566 | { |
| 1567 | LLString info_string; | 1567 | mCircuitInfo.getInfo(info); |
| 1568 | |||
| 1569 | info_string += mCircuitInfo.getInfoString(); | ||
| 1570 | return info_string; | ||
| 1571 | } | 1568 | } |
| 1572 | 1569 | ||
| 1573 | // returns whether the given host is on a trusted circuit | 1570 | // returns whether the given host is on a trusted circuit |