diff options
| author | Richard Linden <none@none> | 2011-10-21 15:04:57 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-10-21 15:04:57 -0700 |
| commit | 7b4c300081d7be1087f6f60f76b955947bdede65 (patch) | |
| tree | b9188c13a96e1eb9592d29cd7f353f63a3689600 | |
| parent | f19ee13c0450e0e16e7c8c9d7f700e11c36886ef (diff) | |
| parent | aaabea2ced46015385a2528d0ca24e8d2a96da55 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-fui
| -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; } |