diff options
author | Steven Bennetts <steve@lindenlab.com> | 2008-04-17 02:56:14 +0000 |
---|---|---|
committer | Steven Bennetts <steve@lindenlab.com> | 2008-04-17 02:56:14 +0000 |
commit | a3f3ab7e113e44309461b26399d627814f0ce4f9 (patch) | |
tree | 695b2a41f8d31330634ef59e7d6ece526242fd86 /indra/llui/llcombobox.cpp | |
parent | d85247e63e5ff0b488211b62429a4895b48dee27 (diff) |
QAR-449 Viewer 1.20 RC 1
merge Branch_1-20-Viewer -r 84432 : 84760 -> release
Diffstat (limited to 'indra/llui/llcombobox.cpp')
-rw-r--r-- | indra/llui/llcombobox.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llcombobox.cpp b/indra/llui/llcombobox.cpp index 0e8239cabd..3dd99a4636 100644 --- a/indra/llui/llcombobox.cpp +++ b/indra/llui/llcombobox.cpp @@ -749,7 +749,7 @@ BOOL LLComboBox::handleToolTip(S32 x, S32 y, LLString& msg, LLRect* sticky_rect_ tool_tip = getToolTip(); if (tool_tip.empty()) { - tool_tip = getValue().asString(); + tool_tip = getSelectedItemLabel(); } } |