From e8818a3677f8af440456abec77cf31e7621fb9fa Mon Sep 17 00:00:00 2001 From: AndreyL ProductEngine Date: Thu, 16 Nov 2017 22:59:55 +0200 Subject: MAINT-8154 Disabled exception handling in LLAppViewer::frame() to get proper call stacks --- indra/newview/llappviewer.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'indra/newview/llappviewer.h') diff --git a/indra/newview/llappviewer.h b/indra/newview/llappviewer.h index 52d2bce42b..6ea0273874 100644 --- a/indra/newview/llappviewer.h +++ b/indra/newview/llappviewer.h @@ -223,6 +223,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. @@ -414,4 +416,6 @@ extern LLUUID gBlackSquareID; extern BOOL gRandomizeFramerate; extern BOOL gPeriodicSlowFrame; +extern BOOL gSimulateMemLeak; + #endif // LL_LLAPPVIEWER_H -- cgit v1.2.3 From 22050467f5ec42b30e98d7bd59dd0ca617b259e4 Mon Sep 17 00:00:00 2001 From: maxim_productengine Date: Tue, 30 Jan 2018 17:45:04 +0200 Subject: MAINT-8180 Add the way to get default string despite of current localiztion --- indra/newview/llappviewer.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'indra/newview/llappviewer.h') diff --git a/indra/newview/llappviewer.h b/indra/newview/llappviewer.h index e5a8883725..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; } -- cgit v1.2.3