diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-04-17 02:42:27 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-04-17 02:42:27 +0000 |
| commit | d85247e63e5ff0b488211b62429a4895b48dee27 (patch) | |
| tree | 0aa2f02aeef6a8133e0d037e95ad5089b20df9eb /indra/newview/llfloaterlagmeter.cpp | |
| parent | d2597d35cf3aeaf0c47a134dfe9119ef7932b98a (diff) | |
QAR-449 Viewer 1.20 RC 0
merge Branch_1-20-Viewer -r 84060 : 84432 -> release
Diffstat (limited to 'indra/newview/llfloaterlagmeter.cpp')
| -rw-r--r-- | indra/newview/llfloaterlagmeter.cpp | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/indra/newview/llfloaterlagmeter.cpp b/indra/newview/llfloaterlagmeter.cpp index 1213d436cc..b70ae9a227 100644 --- a/indra/newview/llfloaterlagmeter.cpp +++ b/indra/newview/llfloaterlagmeter.cpp @@ -49,9 +49,7 @@ const LLString LAG_CRITICAL_IMAGE_NAME = "lag_status_critical.tga"; const LLString LAG_WARNING_IMAGE_NAME = "lag_status_warning.tga"; const LLString LAG_GOOD_IMAGE_NAME = "lag_status_good.tga"; -LLFloaterLagMeter * LLFloaterLagMeter::sInstance = NULL; - -LLFloaterLagMeter::LLFloaterLagMeter() +LLFloaterLagMeter::LLFloaterLagMeter(const LLSD& key) : LLFloater("floater_lagmeter") { LLUICtrlFactory::getInstance()->buildFloater(this, "floater_lagmeter.xml"); @@ -127,8 +125,6 @@ LLFloaterLagMeter::LLFloaterLagMeter() LLFloaterLagMeter::~LLFloaterLagMeter() { - sInstance = NULL; - // save shrunk status for next time gSavedSettings.setBOOL("LagMeterShrunk", mShrunk); // expand so we save the large window rectangle @@ -147,13 +143,6 @@ void LLFloaterLagMeter::draw() LLFloater::draw(); } -//static -void LLFloaterLagMeter::show(void *data) -{ - if(!sInstance) sInstance = new LLFloaterLagMeter(); - sInstance->open(); -} - void LLFloaterLagMeter::determineClient() { F32 client_frame_time = LLViewerStats::getInstance()->mFPSStat.getMeanDuration(); |