diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2018-05-18 18:40:36 +0100 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2018-05-18 18:40:36 +0100 |
| commit | 7a006ea3a217ca27d8d79b1afdf6642fdc7c15ec (patch) | |
| tree | ee080159603c09cf533cff41ce1054df0a3c72e7 /indra/newview/llappviewer.h | |
| parent | 75ff54e56abb3e5e3854605e110af941e94df1a8 (diff) | |
| parent | c70119ebabc4b06e2b0db02aea8c56e01fbc666e (diff) | |
merge
Diffstat (limited to 'indra/newview/llappviewer.h')
| -rw-r--r-- | indra/newview/llappviewer.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/llappviewer.h b/indra/newview/llappviewer.h index 6eb45d2495..e607b4a994 100644 --- a/indra/newview/llappviewer.h +++ b/indra/newview/llappviewer.h @@ -99,8 +99,7 @@ public: void setServerReleaseNotesURL(const std::string& url) { mServerReleaseNotesURL = url; } LLSD getViewerInfo() const; - std::string getViewerInfoString() const; - std::string getShortViewerInfoString() const; + std::string getViewerInfoString(bool default_string = false) const; // Report true if under the control of a debugger. A null-op default. virtual bool beingDebugged() { return false; } @@ -222,6 +221,8 @@ protected: private: + bool doFrame(); + void initMaxHeapSize(); bool initThreads(); // Initialize viewer threads, return false on failure. bool initConfiguration(); // Initialize settings from the command line/config file. @@ -396,4 +397,6 @@ extern LLUUID gBlackSquareID; extern BOOL gRandomizeFramerate; extern BOOL gPeriodicSlowFrame; +extern BOOL gSimulateMemLeak; + #endif // LL_LLAPPVIEWER_H |