diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-12-03 09:31:21 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-12-03 09:31:21 -0500 |
| commit | af18a69c3ed303da9e517ae216de822a9d02762e (patch) | |
| tree | a94c68721aca0129c573dc9a28c80d7251ccaec2 /indra/newview/llversioninfo.cpp | |
| parent | 9e67a2d71030db4e2f54084e141d36a44ebbb37c (diff) | |
| parent | 67c01ab1fb1bfcb03c304946ccb2375f405187bf (diff) | |
merge change to default transparency
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(); } |