Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Useful fixies from upstream

Browse Source
This commit is contained in:
Inusaito Sayori
2014-09-26 12:10:14 -04:00
parent 01f2e70f1d
commit da2d80d23a
4 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
indra/newview/lltoolpie.cpp
View File

@@ -472,7 +472,11 @@ ECursorType LLToolPie::cursorFromObject(LLViewerObject* object)
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:
@@ -578,6 +582,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);
// [RLVa:KB] - Checked: 2010-03-11 (RLVa-1.2.0e) | Modified: RLVa-1.1.0l
// Block all special click action cursors when:
// - @fartouch=n restricted and the object is out of range