diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-12-02 15:28:40 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-12-02 15:28:40 -0500 |
| commit | 90a365ed2f13612d267a4eed9b54bd1b62edb7d5 (patch) | |
| tree | 8e50ccd3db712740de388fa2a46b703a5c313567 /indra/newview/llversioninfo.cpp | |
| parent | 7fedfda82504a8881b7d19d6c6f00fba849e615f (diff) | |
| parent | c1dbf70113274d543019778894f3e4017a174d7d (diff) | |
merge fix for STORM-673
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(); } |