diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-01-24 11:44:43 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-01-24 11:44:43 -0500 |
| commit | f57aa3e83f1b4286b1d6b5cc8bca20fb924cb002 (patch) | |
| tree | 12dae11397876ce10d75eeabe5b1656ea18cd6ac /indra/newview/llversioninfo.h | |
| parent | b429ff8ec3e1aebc60ff7f4d3376cfc8b9f2e669 (diff) | |
| parent | f9b9c7a5816cf0b9627a4a50e73a663667937145 (diff) | |
merge changes for i18n fixes
Diffstat (limited to 'indra/newview/llversioninfo.h')
| -rw-r--r-- | indra/newview/llversioninfo.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/llversioninfo.h b/indra/newview/llversioninfo.h index e468b6ae4e..6f64544f3b 100644 --- a/indra/newview/llversioninfo.h +++ b/indra/newview/llversioninfo.h @@ -58,8 +58,15 @@ public: /// return the viewer version as a string like "2.0.0" static const std::string &getShortVersion(); + /// return the viewer version and channel as a string + /// 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(); + + /// reset the channel name used by the viewer. + static void resetChannel(const std::string& channel); }; #endif |