diff options
| author | Richard Linden <none@none> | 2011-10-15 18:14:23 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-10-15 18:14:23 -0700 |
| commit | 62d9db2f21b2a6fb579e8f7631a4e387cc5e5b29 (patch) | |
| tree | 54587047f6f27d3a1b58a23a1a532a4436e61f65 /indra/newview/llfloatersounddevices.cpp | |
| parent | 94c137d5c970bc01e3a4dbe8de6a7104085e5ba6 (diff) | |
| parent | fc2bd1cce2e6c213fa682b9768d435a4e394a95e (diff) | |
Automated merge with http://hg.secondlife.com/viewer-development
Diffstat (limited to 'indra/newview/llfloatersounddevices.cpp')
| -rw-r--r-- | indra/newview/llfloatersounddevices.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/indra/newview/llfloatersounddevices.cpp b/indra/newview/llfloatersounddevices.cpp index e692f1735a..56c0806546 100644 --- a/indra/newview/llfloatersounddevices.cpp +++ b/indra/newview/llfloatersounddevices.cpp @@ -28,7 +28,6 @@ #include "llfloatersounddevices.h" -#include "llbottomtray.h" #include "lldraghandle.h" #include "llpanelvoicedevicesettings.h" @@ -55,9 +54,6 @@ LLFloaterSoundDevices::~LLFloaterSoundDevices() BOOL LLFloaterSoundDevices::postBuild() { LLTransientDockableFloater::postBuild(); - - LLView *anchor_panel = LLBottomTray::getInstance()->getChild<LLView>("flyout_btn"); - setDockControl(new LLDockControl(anchor_panel, this, getDockTongue(), LLDockControl::TOP)); setIsChrome(TRUE); if (mDragHandle) |