diff options
| author | Don Kjer <don@lindenlab.com> | 2007-05-02 21:24:47 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2007-05-02 21:24:47 +0000 |
| commit | 1c909afe3998778e4cc045c9ab733e8afbf7c25b (patch) | |
| tree | 75c00a32a8e305280cbec253195d1113d628fc3e /indra/llmessage/llcircuit.cpp | |
| parent | bc59c04653bf1404e8148a8169208b146a123b28 (diff) | |
svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into release
Diffstat (limited to 'indra/llmessage/llcircuit.cpp')
| -rw-r--r-- | indra/llmessage/llcircuit.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/llmessage/llcircuit.cpp b/indra/llmessage/llcircuit.cpp index 451fb2e807..e9a60e4eb8 100644 --- a/indra/llmessage/llcircuit.cpp +++ b/indra/llmessage/llcircuit.cpp @@ -1147,13 +1147,13 @@ std::ostream& operator<<(std::ostream& s, LLCircuitData& circuit) return s; } -const char* LLCircuitData::getInfoString() const +const LLString LLCircuitData::getInfoString() const { std::ostringstream info; info << "Circuit: " << mHost << std::endl << (mbAlive ? "Alive" : "Not Alive") << std::endl << "Age: " << mExistenceTimer.getElapsedTimeF32() << std::endl; - return info.str().c_str(); + return LLString(info.str()); } void LLCircuitData::dumpResendCountAndReset() @@ -1177,7 +1177,7 @@ std::ostream& operator<<(std::ostream& s, LLCircuit &circuit) return s; } -const char* LLCircuit::getInfoString() const +const LLString LLCircuit::getInfoString() const { std::ostringstream info; info << "Circuit Info:" << std::endl; @@ -1187,7 +1187,7 @@ const char* LLCircuit::getInfoString() const { info << (*it).second->getInfoString() << std::endl; } - return info.str().c_str(); + return LLString(info.str()); } void LLCircuit::getCircuitRange( |