diff options
| author | Richard Linden <none@none> | 2012-08-30 19:24:07 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-08-30 19:24:07 -0700 |
| commit | 88e455a3a536bae39a0c83ae9bc43cc1252ed4c0 (patch) | |
| tree | 58f4ce4cd3396c1b13b430744ce3e91ce0fa28b2 /indra/newview/llviewerfloaterreg.cpp | |
| parent | d48889198b9f5b39c195e237ae253339b2d89ef3 (diff) | |
| parent | aaac4c7df5858a2dfc385b195446476947244dad (diff) | |
Automated merge with http://bitbucket.org/lindenlab/viewer-cat
Diffstat (limited to 'indra/newview/llviewerfloaterreg.cpp')
| -rw-r--r-- | indra/newview/llviewerfloaterreg.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/llviewerfloaterreg.cpp b/indra/newview/llviewerfloaterreg.cpp index 1f7cf0cdd4..69586e3634 100644 --- a/indra/newview/llviewerfloaterreg.cpp +++ b/indra/newview/llviewerfloaterreg.cpp @@ -73,7 +73,6 @@ #include "llfloaterinspect.h" #include "llfloaterinventory.h" #include "llfloaterjoystick.h" -#include "llfloaterlagmeter.h" #include "llfloaterland.h" #include "llfloaterlandholdings.h" #include "llfloatermap.h" @@ -227,7 +226,6 @@ void LLViewerFloaterReg::registerFloaters() LLNotificationsUI::registerFloater(); LLFloaterDisplayNameUtil::registerFloater(); - LLFloaterReg::add("lagmeter", "floater_lagmeter.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterLagMeter>); LLFloaterReg::add("land_holdings", "floater_land_holdings.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterLandHoldings>); LLFloaterReg::add("mem_leaking", "floater_mem_leaking.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterMemLeak>); |