diff options
| author | Richard Linden <none@none> | 2011-10-26 11:53:01 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-10-26 11:53:01 -0700 |
| commit | f3c0bbf1620a3a65eaa517903467a2a65681e106 (patch) | |
| tree | a77f3b8254ce9030ee3d0e2395a72ebf4ff63501 /indra/llui/lldockablefloater.cpp | |
| parent | 1b173ed82b65c7bb5f5d5294847a721b64f8cf35 (diff) | |
| parent | b0df4f12040152afe0813875eddfe83a078079a2 (diff) | |
Automated merge with http://hg.secondlife.com/viewer-development
Diffstat (limited to 'indra/llui/lldockablefloater.cpp')
| -rw-r--r-- | indra/llui/lldockablefloater.cpp | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/indra/llui/lldockablefloater.cpp b/indra/llui/lldockablefloater.cpp index aea58be12a..0fcd937361 100644 --- a/indra/llui/lldockablefloater.cpp +++ b/indra/llui/lldockablefloater.cpp @@ -239,8 +239,21 @@ void LLDockableFloater::setDockControl(LLDockControl* dockControl) setDocked(isDocked()); } -const LLUIImagePtr& LLDockableFloater::getDockTongue() +const LLUIImagePtr& LLDockableFloater::getDockTongue(LLDockControl::DocAt dock_side) { + switch(dock_side) + { + case LLDockControl::LEFT: + mDockTongue = LLUI::getUIImage("windows/Flyout_Left.png"); + break; + case LLDockControl::RIGHT: + mDockTongue = LLUI::getUIImage("windows/Flyout_Right.png"); + break; + default: + mDockTongue = LLUI::getUIImage("windows/Flyout_Pointer.png"); + break; + } + return mDockTongue; } |