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

Implemented basic 'awareness' of objects flagged as permanent.

Browse Source
This commit is contained in:
Shyotl
2012-08-04 20:46:51 -05:00
parent aca3e8f6c4
commit b847c53395
18 changed files with 605 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
indra/newview/lltoolgrab.cpp
View File

@@ -218,24 +218,37 @@ BOOL LLToolGrab::handleObjectHit(const LLPickInfo& info)
if (!objectp->flagUsePhysics())
{
// In mouselook, we shouldn't be able to grab non-physical,
// non-touchable objects. If it has a touch handler, we
// do grab it (so llDetectedGrab works), but movement is
// blocked on the server side. JC
if (gAgentCamera.cameraMouselook() && !script_touch)
if (script_touch)
{
mMode = GRAB_LOCKED;
gViewerWindow->hideCursor();
gViewerWindow->moveCursorToCenter();
mMode = GRAB_NONPHYSICAL; // if it has a script, use the non-physical grab
}
else
{
mMode = GRAB_NONPHYSICAL;
// In mouselook, we shouldn't be able to grab non-physical,
// non-touchable objects. If it has a touch handler, we
// do grab it (so llDetectedGrab works), but movement is
// blocked on the server side. JC
if (gAgentCamera.cameraMouselook())
{
mMode = GRAB_LOCKED;
gViewerWindow->hideCursor();
gViewerWindow->moveCursorToCenter();
}
else if (objectp->permMove() && !objectp->isPermanentEnforced())
{
mMode = GRAB_ACTIVE_CENTER;
gViewerWindow->hideCursor();
gViewerWindow->moveCursorToCenter();
}
else
{
mMode = GRAB_LOCKED;
}
}
// Don't bail out here, go on and grab so buttons can get
// their "touched" event.
}
else if( !objectp->permMove() )
else if( objectp->flagCharacter() || !objectp->permMove() || objectp->isPermanentEnforced())
{
// if mouse is over a physical object without move permission, show feedback if user tries to move it.
mMode = GRAB_LOCKED;