diff options
| author | Igor Borovkov <iborovkov@productengine.com> | 2010-01-29 14:42:57 +0200 |
|---|---|---|
| committer | Igor Borovkov <iborovkov@productengine.com> | 2010-01-29 14:42:57 +0200 |
| commit | ac0fb461f6ad9e81349bd8814201a641a24f40a3 (patch) | |
| tree | f79aabf905566131061049b8b29b44c394b6bbac /indra/newview/llviewerfloaterreg.cpp | |
| parent | 56d06544376dea0704d139b28d17d44e3c6fadf9 (diff) | |
got rid of lloverlaybar, llmediaremotectrl, llvoiceremotectrl dependencies, updated cmake list
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llviewerfloaterreg.cpp')
| -rw-r--r-- | indra/newview/llviewerfloaterreg.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/indra/newview/llviewerfloaterreg.cpp b/indra/newview/llviewerfloaterreg.cpp index 3aca11963a..f93d78bf33 100644 --- a/indra/newview/llviewerfloaterreg.cpp +++ b/indra/newview/llviewerfloaterreg.cpp @@ -115,7 +115,6 @@ #include "llinspectobject.h" #include "llinspectremoteobject.h" #include "llinspecttoast.h" -#include "llmediaremotectrl.h" #include "llmoveview.h" #include "llnearbychat.h" #include "llpanelblockedlist.h" @@ -263,8 +262,5 @@ void LLViewerFloaterReg::registerFloaters() // *NOTE: Please keep these alphabetized for easier merges - // debug use only - LLFloaterReg::add("media_remote_ctrl", "floater_media_remote.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterMediaRemoteCtrl>); - LLFloaterReg::registerControlVariables(); // Make sure visibility and rect controls get preserved when saving } |