diff options
author | leyla_linden <none@none> | 2010-12-03 15:44:39 -0800 |
---|---|---|
committer | leyla_linden <none@none> | 2010-12-03 15:44:39 -0800 |
commit | 35c67ca7fb9964ee3eabeb66ec441ded94256951 (patch) | |
tree | e70ab4204e8284f201ada83dca884ad8091146bb /indra/newview/llversioninfo.cpp | |
parent | 35d50fe36e83a0b76816c693dc89219041393ae5 (diff) | |
parent | 32db8988ffab8778de106dc769228089bec8aad1 (diff) |
Merge
Diffstat (limited to 'indra/newview/llversioninfo.cpp')
-rw-r--r-- | indra/newview/llversioninfo.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llversioninfo.cpp b/indra/newview/llversioninfo.cpp index 53994c68f2..673d0c24cf 100644 --- a/indra/newview/llversioninfo.cpp +++ b/indra/newview/llversioninfo.cpp @@ -108,15 +108,15 @@ namespace } //static -const std::string &LLVersionInfo::getVersionAndChannel() +const std::string &LLVersionInfo::getChannelAndVersion() { if (sVersionChannel.empty()) { // cache the version string std::ostringstream stream; - stream << LLVersionInfo::getVersion() + stream << LLVersionInfo::getChannel() << " " - << LLVersionInfo::getChannel(); + << LLVersionInfo::getVersion(); sVersionChannel = stream.str(); } |