diff options
| author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-10-27 15:17:20 -0400 |
|---|---|---|
| committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-10-27 15:17:20 -0400 |
| commit | fa220db72a2d0b7cef665cdab53c07cdf4eac4cf (patch) | |
| tree | 3007ca2d839d04ef16692ddbaa59cdd6bf6877af /indra/newview/llfloatersounddevices.cpp | |
| parent | fae5abfd0903f09f1485f1f10ebea410ae4f9845 (diff) | |
| parent | d2af1ae8b09d76ee50a9a67a0f42fbfd6657d816 (diff) | |
merge up from viewer-pre-beta
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"); |