diff options
| author | Paul ProductEngine <pguslisty@productengine.com> | 2011-10-21 19:14:10 +0200 |
|---|---|---|
| committer | Paul ProductEngine <pguslisty@productengine.com> | 2011-10-21 19:14:10 +0200 |
| commit | 2456573925567ed91d4cc227d7fc97b90248a1fa (patch) | |
| tree | 96006b159d52eb49396bc22c4e45f4c2c5c99918 /indra | |
| parent | 45b10b07473f011bbb9db687fca6daf1190e3d5d (diff) | |
EXP-1404 FIXED (Dock icon shown in lower left corner of call dialog when user has speak icon hidden)
- Don't draw tongue of dockable call dialog floater in case speak button is not present in any tool bar.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llui/lldockablefloater.h | 2 | ||||
| -rw-r--r-- | indra/newview/llimview.cpp | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/indra/llui/lldockablefloater.h b/indra/llui/lldockablefloater.h index 8deb6c1159..1484ea3978 100644 --- a/indra/llui/lldockablefloater.h +++ b/indra/llui/lldockablefloater.h @@ -113,6 +113,8 @@ public: bool getUniqueDocking() { return mUniqueDocking; } bool getUseTongue() { return mUseTongue; } + + void setUseTongue(bool use_tongue) { mUseTongue = use_tongue;} private: /** * Provides unique of dockable floater. diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index 6e9baed5f2..33c6b2218c 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -1683,6 +1683,8 @@ BOOL LLCallDialog::postBuild() LLView *anchor_panel = gToolBarView->findChildView("speak"); setDockControl(new LLDockControl(anchor_panel, this, getDockTongue(), LLDockControl::TOP)); + setUseTongue(anchor_panel); + return TRUE; } |