diff options
author | Oz Linden <oz@lindenlab.com> | 2012-05-08 15:51:56 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2012-05-08 15:51:56 -0400 |
commit | 95090c5d1e857130f7266b5753d3650d02e9386c (patch) | |
tree | cff60656371883829dd7451ed4a1d3d09258b5ae /indra/newview/llinventorypanel.cpp | |
parent | 5bf742895d882f1d7178c2b18a347bf485877a02 (diff) | |
parent | d6569db3520f7e0ce2d93febb6f4e26b48c08a3d (diff) |
merge changes for version 3.3.1
Diffstat (limited to 'indra/newview/llinventorypanel.cpp')
-rw-r--r-- | indra/newview/llinventorypanel.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp index 382569fa3a..01a8ecfb5d 100644 --- a/indra/newview/llinventorypanel.cpp +++ b/indra/newview/llinventorypanel.cpp @@ -817,7 +817,7 @@ BOOL LLInventoryPanel::handleHover(S32 x, S32 y, MASK mask) if(handled) { ECursorType cursor = getWindow()->getCursor(); - if (LLInventoryModelBackgroundFetch::instance().backgroundFetchActive() && cursor == UI_CURSOR_ARROW) + if (LLInventoryModelBackgroundFetch::instance().folderFetchActive() && cursor == UI_CURSOR_ARROW) { // replace arrow cursor with arrow and hourglass cursor getWindow()->setCursor(UI_CURSOR_WORKING); |