diff options
| author | Yuri Chebotarev <ychebotarev@productengine.com> | 2010-03-31 16:49:26 +0300 |
|---|---|---|
| committer | Yuri Chebotarev <ychebotarev@productengine.com> | 2010-03-31 16:49:26 +0300 |
| commit | 349bc84dfd73702fe788f9ac4539d8046b78e9f3 (patch) | |
| tree | 4a0f772749ae4c21712fdb07eaabdb5b8a435a68 /indra/newview/llinventorypanel.cpp | |
| parent | 0a0f6dec5f6128990f4116c1f90e19691e30c3d2 (diff) | |
| parent | 8ef5fd0e144af53e6044c0dfc15fda9b36bdd85a (diff) | |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llinventorypanel.cpp')
| -rw-r--r-- | indra/newview/llinventorypanel.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp index 9a2d76e7e2..83c2d62ee8 100644 --- a/indra/newview/llinventorypanel.cpp +++ b/indra/newview/llinventorypanel.cpp @@ -43,6 +43,8 @@ #include "llimfloater.h" #include "llimview.h" #include "llinventorybridge.h" +#include "llinventoryfunctions.h" +#include "llinventorymodelbackgroundfetch.h" #include "llsidepanelinventory.h" #include "llsidetray.h" #include "llscrollcontainer.h" @@ -643,7 +645,7 @@ BOOL LLInventoryPanel::handleHover(S32 x, S32 y, MASK mask) if(handled) { ECursorType cursor = getWindow()->getCursor(); - if (LLInventoryModel::backgroundFetchActive() && cursor == UI_CURSOR_ARROW) + if (LLInventoryModelBackgroundFetch::instance().backgroundFetchActive() && cursor == UI_CURSOR_ARROW) { // replace arrow cursor with arrow and hourglass cursor getWindow()->setCursor(UI_CURSOR_WORKING); |