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

Further LLViewerMenu updates

Browse Source
This commit is contained in:
Lirusaito
2013-03-29 03:01:18 -04:00
parent dff59ab455
commit e44ba343a6
4 changed files with 678 additions and 583 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
indra/newview/lltoolpie.cpp
View File

@@ -207,15 +207,16 @@ BOOL LLToolPie::pickAndShowMenu(BOOL always_show)
// touch behavior down below...
break;
case CLICK_ACTION_SIT:
if ((isAgentAvatarValid()) && (!gAgentAvatarp->isSitting())
&& (!gSavedSettings.getBOOL("DisableClickSit"))) // agent not already sitting
{
handle_sit_or_stand();
// put focus in world when sitting on an object
gFocusMgr.setKeyboardFocus(NULL);
return TRUE;
} // else nothing (fall through to touch)
if (!gSavedSettings.getBOOL("DisableClickSit"))
if (isAgentAvatarValid() && !gAgentAvatarp->isSitting()) // agent not already sitting
{
handle_object_sit_or_stand();
// put focus in world when sitting on an object
gFocusMgr.setKeyboardFocus(NULL);
return TRUE;
} // else nothing (fall through to touch)
}
case CLICK_ACTION_PAY:
if ((object && object->flagTakesMoney())
|| (parent && parent->flagTakesMoney()))