diff options
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
| -rw-r--r-- | indra/newview/llviewerwindow.cpp | 30 |
1 files changed, 24 insertions, 6 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index d73029df1e..d81c8eec70 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -1471,7 +1471,9 @@ void LLViewerWindow::initBase() LLToolTipView::Params hvp; hvp.name("tooltip view"); hvp.rect(full_window); + hvp.follows.flags(FOLLOWS_ALL); gToolTipView = LLUICtrlFactory::create<LLToolTipView>(hvp); + gToolTipView->setFollowsAll(); getRootView()->addChild(gToolTipView); // Add the progress bar view (startup view), which overrides everything @@ -1506,11 +1508,6 @@ void LLViewerWindow::initWorldUI() // currently needs to happen before initializing chat or IM LLFloaterReg::getInstance("communicate"); - if ( gSavedPerAccountSettings.getBOOL("LogShowHistory") ) - { - LLFloaterChat::loadHistory(); - } - LLRect morph_view_rect = full_window; morph_view_rect.stretch( -STATUS_BAR_HEIGHT ); morph_view_rect.mTop = full_window.mTop - 32; @@ -1574,6 +1571,11 @@ void LLViewerWindow::initWorldUI() LLBottomTray::getInstance()->showCameraButton(FALSE); } + if (!gSavedSettings.getBOOL("ShowSnapshotButton")) + { + LLBottomTray::getInstance()->showSnapshotButton(FALSE); + } + if (!gSavedSettings.getBOOL("ShowMoveButton")) { LLBottomTray::getInstance()->showMoveButton(FALSE); @@ -2608,8 +2610,24 @@ void LLViewerWindow::updateUI() { it.skipDescendants(); } - else if (viewp->getMouseOpaque()) + // only report xui names for LLUICtrls, + // and blacklist the various containers we don't care about + else if (dynamic_cast<LLUICtrl*>(viewp) + && viewp != gMenuHolder + && viewp != gFloaterView + && viewp != gNotifyBoxView + && viewp != gConsole) { + if (dynamic_cast<LLFloater*>(viewp)) + { + // constrain search to descendants of this (frontmost) floater + // by resetting iterator + it = viewp->beginTreeDFS(); + } + + // if we are in a new part of the tree (not a descendent of current tooltip_view) + // then push the results for tooltip_view and start with a new potential view + // NOTE: this emulates visiting only the leaf nodes that meet our criteria if (!viewp->hasAncestor(tooltip_view)) { append_xui_tooltip(tooltip_view, tool_tip_msg); |