diff options
| author | Richard Linden <none@none> | 2011-10-27 17:22:26 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-10-27 17:22:26 -0700 |
| commit | 6e8ffc247fe52668446b8fa1ed7f1547a755076f (patch) | |
| tree | 23b6fa5ce6bf6a32944faca54f9a18aca255fd75 /indra/newview/llfloatersounddevices.cpp | |
| parent | 0ecc5c0878adf93e96b99e3db4c65cdb757b99fb (diff) | |
| parent | fcd1ccd21e3ea8f0944537347dd6c9d7972d50ce (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
Diffstat (limited to 'indra/newview/llfloatersounddevices.cpp')
| -rw-r--r-- | indra/newview/llfloatersounddevices.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/indra/newview/llfloatersounddevices.cpp b/indra/newview/llfloatersounddevices.cpp index e692f1735a..72c077d215 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,13 +54,7 @@ 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) - mDragHandle->setTitleVisible(TRUE); updateTransparency(TT_ACTIVE); // force using active floater transparency (STORM-730) LLPanelVoiceDeviceSettings* panel = findChild<LLPanelVoiceDeviceSettings>("device_settings_panel"); |