diff options
| author | andreykproductengine <akleshchev@productengine.com> | 2014-03-28 17:54:07 +0200 |
|---|---|---|
| committer | andreykproductengine <akleshchev@productengine.com> | 2014-03-28 17:54:07 +0200 |
| commit | f7b66fadf65365797025ec56773cad8cf9c8900f (patch) | |
| tree | c203a6762f8d2d8b6ea960760a7107149378d6a2 /indra/newview | |
| parent | 6ca7c588a898304177850cbe02961e21b93046a2 (diff) | |
MAINT-1606 FIXED Warning message 'The object is not for sale' appears while user try to buy the shared object
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/lltoolpie.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp index a09a2739e8..8a341e2c95 100755 --- a/indra/newview/lltoolpie.cpp +++ b/indra/newview/lltoolpie.cpp @@ -438,8 +438,12 @@ ECursorType LLToolPie::cursorFromObject(LLViewerObject* object) break; case CLICK_ACTION_BUY: if ( mClickActionBuyEnabled ) - { - cursor = UI_CURSOR_TOOLBUY; + { + LLSelectNode* node = LLSelectMgr::getInstance()->getHoverNode(); + if (!node || node->mSaleInfo.isForSale()) + { + cursor = UI_CURSOR_TOOLBUY; + } } break; case CLICK_ACTION_OPEN: @@ -543,6 +547,7 @@ BOOL LLToolPie::handleHover(S32 x, S32 y, MASK mask) mHoverPick = gViewerWindow->pickImmediate(x, y, FALSE); LLViewerObject *parent = NULL; LLViewerObject *object = mHoverPick.getObject(); + LLSelectMgr::getInstance()->setHoverObject(object, mHoverPick.mObjectFace); if (object) { parent = object->getRootEdit(); |