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.h | |
| parent | 7fedfda82504a8881b7d19d6c6f00fba849e615f (diff) | |
| parent | c1dbf70113274d543019778894f3e4017a174d7d (diff) | |
merge fix for STORM-673
Diffstat (limited to 'indra/newview/llversioninfo.h')
| -rw-r--r-- | indra/newview/llversioninfo.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llversioninfo.h b/indra/newview/llversioninfo.h index 36defbcd68..6f64544f3b 100644 --- a/indra/newview/llversioninfo.h +++ b/indra/newview/llversioninfo.h @@ -59,8 +59,8 @@ public: static const std::string &getShortVersion(); /// return the viewer version and channel as a string - /// like "2.0.0.200030 Second Life Release" - static const std::string &getVersionAndChannel(); + /// like "Second Life Release 2.0.0.200030" + static const std::string &getChannelAndVersion(); /// return the channel name, e.g. "Second Life" static const std::string &getChannel(); |