diff options
| author | callum <none@none> | 2011-10-14 15:22:10 -0700 |
|---|---|---|
| committer | callum <none@none> | 2011-10-14 15:22:10 -0700 |
| commit | bfda156022df272cda390e22dd31937b74eceb39 (patch) | |
| tree | 202cf50815a6304d4262955a1c097d80641452b5 /indra/newview/llfloatersounddevices.cpp | |
| parent | baed4d8f4338e8788d1948af4c49d01fc8f32a98 (diff) | |
| parent | bdf6363e6aa4216913607e83bfc5e159f2535407 (diff) | |
merge with head
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) |