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/llstartup.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/llstartup.cpp')
| -rw-r--r-- | indra/newview/llstartup.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 461730b947..c5bb21dad2 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -84,6 +84,7 @@ #include "llcolorscheme.h" #include "llconsole.h" #include "llcontainerview.h" +#include "llfloaterstats.h" #include "lldebugview.h" #include "lldrawable.h" #include "lleventnotifier.h" @@ -1629,7 +1630,7 @@ BOOL idle_startup() LLError::logToFixedBuffer(gDebugView->mDebugConsolep); // set initial visibility of debug console gDebugView->mDebugConsolep->setVisible(gSavedSettings.getBOOL("ShowDebugConsole")); - gDebugView->mStatViewp->setVisible(gSavedSettings.getBOOL("ShowDebugStats")); + gDebugView->mFloaterStatsp->setVisible(gSavedSettings.getBOOL("ShowDebugStats")); } // @@ -2273,7 +2274,7 @@ BOOL idle_startup() if(gFloaterWorldMap) { gFloaterWorldMap->observeInventory(&gInventory); - gFloaterWorldMap->observeFriends(); + //gFloaterWorldMap->observeFriends(); } gViewerWindow->showCursor(); @@ -3036,7 +3037,7 @@ void init_stat_view() LLRect rect; LLStatBar *stat_barp; - rect = gDebugView->mStatViewp->getRect(); + rect = gDebugView->mFloaterStatsp->getRect(); // // Viewer advanced stats @@ -3047,7 +3048,7 @@ void init_stat_view() // Viewer Basic // stat_viewp = new LLStatView("basic stat view", "Basic", "OpenDebugStatBasic", rect); - gDebugView->mStatViewp->addChildAtEnd(stat_viewp); + gDebugView->mFloaterStatsp->addStatView(stat_viewp); stat_barp = stat_viewp->addStat("FPS", &(gViewerStats->mFPSStat)); stat_barp->setUnitLabel(" fps"); @@ -3091,7 +3092,7 @@ void init_stat_view() stat_viewp = new LLStatView("advanced stat view", "Advanced", "OpenDebugStatAdvanced", rect); - gDebugView->mStatViewp->addChildAtEnd(stat_viewp); + gDebugView->mFloaterStatsp->addStatView(stat_viewp); LLStatView *render_statviewp; @@ -3249,7 +3250,7 @@ void init_stat_view() // Simulator stats LLStatView *sim_statviewp = new LLStatView("sim stat view", "Simulator", "OpenDebugStatSim", rect); - gDebugView->mStatViewp->addChildAtEnd(sim_statviewp); + gDebugView->mFloaterStatsp->addStatView(sim_statviewp); stat_barp = sim_statviewp->addStat("Time Dilation", &(gViewerStats->mSimTimeDilation)); stat_barp->mPrecision = 2; @@ -3485,10 +3486,10 @@ void init_stat_view() stat_barp->mDisplayBar = FALSE; stat_barp->mDisplayMean = FALSE; - LLRect r = gDebugView->mStatViewp->getRect(); + LLRect r = gDebugView->mFloaterStatsp->getRect(); // Reshape based on the parameters we set. - gDebugView->mStatViewp->reshape(r.getWidth(), r.getHeight()); + gDebugView->mFloaterStatsp->reshape(r.getWidth(), r.getHeight()); } void asset_callback_nothing(LLVFS*, const LLUUID&, LLAssetType::EType, void*, S32) |