From ce28e056c20bf2723f565bbf464b87781ec248a2 Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Fri, 15 Aug 2008 23:45:42 -0500 Subject: Second Life viewer sources 1.20.2 --- linden/indra/newview/lllcd.cpp | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'linden/indra/newview/lllcd.cpp') diff --git a/linden/indra/newview/lllcd.cpp b/linden/indra/newview/lllcd.cpp index f9660b5..6574f6f 100644 --- a/linden/indra/newview/lllcd.cpp +++ b/linden/indra/newview/lllcd.cpp @@ -37,7 +37,7 @@ #include "llstatusbar.h" #include "llviewerregion.h" #include "llviewerstats.h" -#include "llvieweruictrlfactory.h" +#include "lluictrlfactory.h" #include "llviewercontrol.h" #if LL_LCD_COMPILE @@ -63,7 +63,7 @@ void CreateLCDDebugWindows() { // load up the text so we are sure it's externalized and localized correctly. bogus = new LLPanel(); - gUICtrlFactory->buildPanel(bogus, "lcd_text.xml"); + LLUICtrlFactory::getInstance()->buildPanel(bogus, "lcd_text.xml"); LLLCDPageGroup *pageGroup = NULL; pageGroup = new llDefaultPageGroup(gLcdScreen->mLCD, LLLCD::kLCDDefault, gLcdScreen->mSLIcon); @@ -212,14 +212,11 @@ void LLDebugPageGroup::UpdateDetails() ping = llformat("%d", gStatusBar->mRegionDetails.mPing); } - if (gViewerStats) - { - packetLoss = llformat("%.1f%%", gViewerStats->mPacketsLostPercentStat.getCurrent()); - simfps = llformat("%d", (int)gViewerStats->mSimFPS.getCurrent()); - fps = llformat("%.1f%", gViewerStats->mFPSStat.getMeanPerSec()); - packetsIn = llformat("%d", (int)gViewerStats->mSimInPPS.getCurrent()); - packetsOut = llformat("%d", (int)gViewerStats->mSimOutPPS.getCurrent()); - } + packetLoss = llformat("%.1f%%", LLViewerStats::getInstance()->mPacketsLostPercentStat.getCurrent()); + simfps = llformat("%d", (int)LLViewerStats::getInstance()->mSimFPS.getCurrent()); + fps = llformat("%.1f%", LLViewerStats::getInstance()->mFPSStat.getMeanPerSec()); + packetsIn = llformat("%d", (int)LLViewerStats::getInstance()->mSimInPPS.getCurrent()); + packetsOut = llformat("%d", (int)LLViewerStats::getInstance()->mSimOutPPS.getCurrent()); // fps mLCD->SetText(mPageArray[0].mDisplayItemArray[0], (LPCTSTR)(utf8str_to_utf16str(fps).c_str())); -- cgit v1.1