diff options
| author | Mark Palange (Mani) <palange@lindenlab.com> | 2010-11-18 15:36:11 -0800 |
|---|---|---|
| committer | Mark Palange (Mani) <palange@lindenlab.com> | 2010-11-18 15:36:11 -0800 |
| commit | 6802775bc4952874e26f320e1ec7ce9f7ed2e2fb (patch) | |
| tree | fb5b9b355214fe5ab949ff62ad5146d49557c2e0 /indra/newview/llversioninfo.h | |
| parent | 327a922dc9cda771077826ecf7521464ebd281c0 (diff) | |
| parent | 0e52564f0a36365c2ce5f5263d15778394741fde (diff) | |
Merge with viewer-development
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..36defbcd68 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 "2.0.0.200030 Second Life Release" + static const std::string &getVersionAndChannel(); + /// 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 |