diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-04-01 17:45:04 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-04-01 17:45:04 +0000 |
| commit | 941cb9f4124c9ccfd5c845bc94639fa46df12c3d (patch) | |
| tree | e0f525e7bd6cc76d89b2df69c6f1554d191561e8 /indra/newview/llfloaterabout.cpp | |
| parent | ecec626dec93524f7ef5831a5ba344d6449b99bc (diff) | |
merge release@83343 skinning-1-merge@83714 -> release
QAR-424
Diffstat (limited to 'indra/newview/llfloaterabout.cpp')
| -rw-r--r-- | indra/newview/llfloaterabout.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/indra/newview/llfloaterabout.cpp b/indra/newview/llfloaterabout.cpp index 60385b8ca5..62fe68f67a 100644 --- a/indra/newview/llfloaterabout.cpp +++ b/indra/newview/llfloaterabout.cpp @@ -46,7 +46,7 @@ #include "llviewerregion.h" #include "llversionviewer.h" #include "llviewerbuild.h" -#include "llvieweruictrlfactory.h" +#include "lluictrlfactory.h" #include "llappviewer.h" #include "llglheaders.h" #include "llmediamanager.h" @@ -70,7 +70,7 @@ LLFloaterAbout* LLFloaterAbout::sInstance = NULL; LLFloaterAbout::LLFloaterAbout() : LLFloater("floater_about", "FloaterAboutRect", "") { - gUICtrlFactory->buildFloater(this, "floater_about.xml"); + LLUICtrlFactory::getInstance()->buildFloater(this, "floater_about.xml"); // Support for changing product name. LLString title("About "); @@ -157,13 +157,12 @@ LLFloaterAbout::LLFloaterAbout() } } - if (gViewerStats - && gPacketsIn > 0) + if (gPacketsIn > 0) { LLString packet_loss = llformat("Packets Lost: %.0f/%.0f (%.1f%%)", - gViewerStats->mPacketsLostStat.getCurrent(), + LLViewerStats::getInstance()->mPacketsLostStat.getCurrent(), F32(gPacketsIn), - 100.f*gViewerStats->mPacketsLostStat.getCurrent() / F32(gPacketsIn) ); + 100.f*LLViewerStats::getInstance()->mPacketsLostStat.getCurrent() / F32(gPacketsIn) ); support.append(packet_loss); support.append("\n"); } |