diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-12-03 14:49:33 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-12-03 14:49:33 -0500 |
| commit | f79615caced2cebb8e71b388b0dea45776b2f24b (patch) | |
| tree | 44d7434cc5046976b03169bc74da71620c237a2b /indra/newview/llversioninfo.cpp | |
| parent | 4e922949a9a1e508a698ce5a03657f1417252d9f (diff) | |
| parent | 2491555272283340206f3532b9417ec07df40022 (diff) | |
Automated merge up 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(); } |