diff options
| author | Josh Bell <josh@lindenlab.com> | 2008-03-04 16:59:57 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2008-03-04 16:59:57 +0000 |
| commit | a10f9639004b4eedc3b6e7b624912ff4ebd8fdc5 (patch) | |
| tree | 051625f9ac6a0d08f613cf11da318c3fd30b06a9 /indra/newview/llappviewer.cpp | |
| parent | 62d9c7f76ce4953064fbc2a778ad4ecefb918e01 (diff) | |
svn merge -r 81304:81392 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-ui-8-merge
QAR-343 - merge maint-ui-7 and maint-ui-8 to release
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 803c8325c2..8c7af9ebf7 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -108,6 +108,7 @@ #include "lldebugview.h" #include "llconsole.h" #include "llcontainerview.h" +#include "llfloaterstats.h" #include "llhoverview.h" #include "llsdserialize.h" @@ -210,13 +211,6 @@ extern OSStatus DisplayReleaseNotes(void); #endif // LL_DARWIN -#include "moviemaker.h" -extern BOOL gbCapturing; - -#if !LL_SOLARIS - extern MovieMaker gMovieMaker; -#endif - extern BOOL gRandomizeFramerate; extern BOOL gPeriodicSlowFrame; @@ -1425,12 +1419,6 @@ bool LLAppViewer::mainLoop() LLFloaterSnapshot::update(); // take snapshots -#if !LL_SOLARIS - if (gbCapturing) - { - gMovieMaker.Snap(); - } -#endif #if LL_WINDOWS && LL_LCD_COMPILE // update LCD Screen gLcdScreen->UpdateDisplay(); @@ -2440,7 +2428,7 @@ void LLAppViewer::cleanupSavedSettings() if (gDebugView) { gSavedSettings.setBOOL("ShowDebugConsole", gDebugView->mDebugConsolep->getVisible()); - gSavedSettings.setBOOL("ShowDebugStats", gDebugView->mStatViewp->getVisible()); + gSavedSettings.setBOOL("ShowDebugStats", gDebugView->mFloaterStatsp->getVisible()); } } |