diff options
Diffstat (limited to 'linden/indra/llmessage/llcircuit.cpp')
-rw-r--r-- | linden/indra/llmessage/llcircuit.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/linden/indra/llmessage/llcircuit.cpp b/linden/indra/llmessage/llcircuit.cpp index 5e93e0a..239c1df 100644 --- a/linden/indra/llmessage/llcircuit.cpp +++ b/linden/indra/llmessage/llcircuit.cpp | |||
@@ -1167,13 +1167,13 @@ std::ostream& operator<<(std::ostream& s, LLCircuitData& circuit) | |||
1167 | return s; | 1167 | return s; |
1168 | } | 1168 | } |
1169 | 1169 | ||
1170 | const char* LLCircuitData::getInfoString() const | 1170 | const LLString LLCircuitData::getInfoString() const |
1171 | { | 1171 | { |
1172 | std::ostringstream info; | 1172 | std::ostringstream info; |
1173 | info << "Circuit: " << mHost << std::endl | 1173 | info << "Circuit: " << mHost << std::endl |
1174 | << (mbAlive ? "Alive" : "Not Alive") << std::endl | 1174 | << (mbAlive ? "Alive" : "Not Alive") << std::endl |
1175 | << "Age: " << mExistenceTimer.getElapsedTimeF32() << std::endl; | 1175 | << "Age: " << mExistenceTimer.getElapsedTimeF32() << std::endl; |
1176 | return info.str().c_str(); | 1176 | return LLString(info.str()); |
1177 | } | 1177 | } |
1178 | 1178 | ||
1179 | void LLCircuitData::dumpResendCountAndReset() | 1179 | void LLCircuitData::dumpResendCountAndReset() |
@@ -1197,7 +1197,7 @@ std::ostream& operator<<(std::ostream& s, LLCircuit &circuit) | |||
1197 | return s; | 1197 | return s; |
1198 | } | 1198 | } |
1199 | 1199 | ||
1200 | const char* LLCircuit::getInfoString() const | 1200 | const LLString LLCircuit::getInfoString() const |
1201 | { | 1201 | { |
1202 | std::ostringstream info; | 1202 | std::ostringstream info; |
1203 | info << "Circuit Info:" << std::endl; | 1203 | info << "Circuit Info:" << std::endl; |
@@ -1207,7 +1207,7 @@ const char* LLCircuit::getInfoString() const | |||
1207 | { | 1207 | { |
1208 | info << (*it).second->getInfoString() << std::endl; | 1208 | info << (*it).second->getInfoString() << std::endl; |
1209 | } | 1209 | } |
1210 | return info.str().c_str(); | 1210 | return LLString(info.str()); |
1211 | } | 1211 | } |
1212 | 1212 | ||
1213 | void LLCircuit::getCircuitRange( | 1213 | void LLCircuit::getCircuitRange( |