diff options
| author | callum <none@none> | 2010-12-03 11:55:08 -0800 |
|---|---|---|
| committer | callum <none@none> | 2010-12-03 11:55:08 -0800 |
| commit | 6ec12a2cd9bc7ba6a8d8451fd8eb86ba43b2cd8c (patch) | |
| tree | d8ef6121c4d018de65bc06f70f92cec4d402d3d9 /indra/newview/llversioninfo.cpp | |
| parent | 1c946e8e4dcb6a6fcdfafeca82d9ba1db9f09e54 (diff) | |
| parent | 2491555272283340206f3532b9417ec07df40022 (diff) | |
Merge after pull from viewer-development
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(); } |