diff options
author | Aura Linden <aura@lindenlab.com> | 2014-03-13 21:55:22 +0000 |
---|---|---|
committer | Aura Linden <aura@lindenlab.com> | 2014-03-13 21:55:22 +0000 |
commit | 706ec08deb3feaea9c5c3516dea657b86b0474c3 (patch) | |
tree | a918eac8a10e43b78d156cb0620520420f0dfc62 /indra/newview/llappviewer.h | |
parent | d2bb4dae980a887a30b206875d8f9419901ed66a (diff) | |
parent | cb91708332b8b8ddfe27808602ec5f43f11c24c2 (diff) |
Merged in viewer-release
Diffstat (limited to 'indra/newview/llappviewer.h')
-rwxr-xr-x | indra/newview/llappviewer.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llappviewer.h b/indra/newview/llappviewer.h index 72e317566c..cbaa7bc4c2 100755 --- a/indra/newview/llappviewer.h +++ b/indra/newview/llappviewer.h @@ -85,6 +85,10 @@ public: const LLOSInfo& getOSInfo() const { return mSysOSInfo; } + void setServerReleaseNotesURL(const std::string& url) { mServerReleaseNotesURL = url; } + LLSD getViewerInfo() const; + std::string getViewerInfoString() const; + // Report true if under the control of a debugger. A null-op default. virtual bool beingDebugged() { return false; } @@ -246,6 +250,8 @@ private: LLOSInfo mSysOSInfo; bool mReportedCrash; + std::string mServerReleaseNotesURL; + // Thread objects. static LLTextureCache* sTextureCache; static LLImageDecodeThread* sImageDecodeThread; |