Second Life viewer sources 1.15.1.3

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)
         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()
@@ -1197,7 +1197,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;
@@ -1207,7 +1207,7 @@ const char* LLCircuit::getInfoString() const
         {
                 info << (*it).second->getInfoString() << std::endl;
         }
-        return info.str().c_str();
+        return LLString(info.str());
 }
 
 void LLCircuit::getCircuitRange(