diff options
| author | Josh Bell <josh@lindenlab.com> | 2007-01-04 02:04:29 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2007-01-04 02:04:29 +0000 |
| commit | d60f16540dba5616cd8260046b44ebc2a1047065 (patch) | |
| tree | ab241efaf58ba4eeb1916763cef337a04bc15d64 /indra/llui/llview.cpp | |
| parent | 0434d35c160bcd0d78b8f4e795a62155f50a6fb8 (diff) | |
svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@56429 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance@56431
This turned up the following "lost" changes:
llapp.cpp (from maintenance r55371) - SIGPIPE fix, possibly
llfontgl.cpp (from maintenance r50207) - whitespace only
inventorybridge.cpp (property - non-executable)
skins/xui/*/* (from maintenance r55380) - XML processing instruction went AWOL
Diffstat (limited to 'indra/llui/llview.cpp')
| -rw-r--r-- | indra/llui/llview.cpp | 31 |
1 files changed, 30 insertions, 1 deletions
diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp index 6323a408bb..64ba319151 100644 --- a/indra/llui/llview.cpp +++ b/indra/llui/llview.cpp @@ -811,6 +811,35 @@ BOOL LLView::handleHover(S32 x, S32 y, MASK mask) return handled; } +LLString LLView::getShowNamesToolTip() +{ + LLView* view = getParent(); + LLString name; + LLString tool_tip = mName; + + while (view) + { + name = view->getName(); + + if (name == "root") break; + + if (view->getToolTip().find(".xml") != LLString::npos) + { + tool_tip = view->getToolTip() + "/" + tool_tip; + break; + } + else + { + tool_tip = view->getName() + "/" + tool_tip; + } + + view = view->getParent(); + } + + return "/" + tool_tip; +} + + BOOL LLView::handleToolTip(S32 x, S32 y, LLString& msg, LLRect* sticky_rect_screen) { BOOL handled = FALSE; @@ -834,7 +863,7 @@ BOOL LLView::handleToolTip(S32 x, S32 y, LLString& msg, LLRect* sticky_rect_scre if (LLUI::sShowXUINames && (mToolTipMsg.find(".xml", 0) == LLString::npos) && (mName.find("Drag", 0) == LLString::npos)) { - tool_tip = mName; + tool_tip = getShowNamesToolTip(); } else { |