diff options
| -rw-r--r-- | .hgtags | 2 | ||||
| -rw-r--r-- | doc/contributions.txt | 5 | ||||
| -rw-r--r-- | indra/llmessage/llcurl.cpp | 5 | ||||
| -rw-r--r-- | indra/newview/llnamelistctrl.cpp | 24 |
4 files changed, 28 insertions, 8 deletions
@@ -69,3 +69,5 @@ db0fe9bb65187f365e58a717dd23d0f4754a9c1d DRTVWR-17_2.3.0-beta2 54d772d8687c69b1d773f6ce14bbc7bdc9d6c05f DRTVWR-33_2.5.0-beta2 b723921b5c711bd24dbe77dc76ef488b544dac78 2.5.0-beta3 b723921b5c711bd24dbe77dc76ef488b544dac78 DRTVWR-34_2.5.0-beta3 +b723921b5c711bd24dbe77dc76ef488b544dac78 2.5.0-release +b723921b5c711bd24dbe77dc76ef488b544dac78 DRTVWR-31_2.5.0-release diff --git a/doc/contributions.txt b/doc/contributions.txt index 4a38e56b10..8dd9f7e31d 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -396,10 +396,7 @@ Jonathan Yap STORM-869 VWR-17801 VWR-24347 - STORM-844 - STORM-643 - STORM-960 - STORM-953 + STORM-975 Kage Pixel VWR-11 Ken March diff --git a/indra/llmessage/llcurl.cpp b/indra/llmessage/llcurl.cpp index 2b9bfff536..b0f68df2e8 100644 --- a/indra/llmessage/llcurl.cpp +++ b/indra/llmessage/llcurl.cpp @@ -1199,10 +1199,7 @@ void LLCurl::cleanupClass() Easy::sFreeHandles.clear(); - if (!Easy::sActiveHandles.empty()) - { - llerrs << "CURL easy handles not cleaned up on shutdown!" << llendl; - } + llassert(Easy::sActiveHandles.empty()); } const unsigned int LLCurl::MAX_REDIRECTS = 5; diff --git a/indra/newview/llnamelistctrl.cpp b/indra/newview/llnamelistctrl.cpp index 38100aa6c5..afceb58ccf 100644 --- a/indra/newview/llnamelistctrl.cpp +++ b/indra/newview/llnamelistctrl.cpp @@ -143,6 +143,30 @@ void LLNameListCtrl::mouseOverHighlightNthItem( S32 target_index ) S32 cur_index = getHighlightedItemInx(); if (cur_index != target_index) { + bool is_mouse_over_name_cell = false; + + S32 mouse_x, mouse_y; + LLUI::getMousePositionLocal(this, &mouse_x, &mouse_y); + + S32 column_index = getColumnIndexFromOffset(mouse_x); + LLScrollListItem* hit_item = hitItem(mouse_x, mouse_y); + if (hit_item && column_index == mNameColumnIndex) + { + // Get the name cell which is currently under the mouse pointer. + LLScrollListCell* hit_cell = hit_item->getColumn(column_index); + if (hit_cell) + { + is_mouse_over_name_cell = getCellRect(cur_index, column_index).pointInRect(mouse_x, mouse_y); + } + } + + // If the tool tip is visible and the mouse is over the currently highlighted item's name cell, + // we should not reset the highlighted item index i.e. set mHighlightedItem = -1 + // and should not increase the width of the text inside the cell because it may + // overlap the tool tip icon. + if (LLToolTipMgr::getInstance()->toolTipVisible() && is_mouse_over_name_cell) + return; + if(0 <= cur_index && cur_index < (S32)getItemList().size()) { LLScrollListItem* item = getItemList()[cur_index]; |