diff options
| author | prep <none@none> | 2012-02-29 12:04:09 -0500 |
|---|---|---|
| committer | prep <none@none> | 2012-02-29 12:04:09 -0500 |
| commit | 91fdd33f765b2f1ae7a4608bc426a106c75cfc11 (patch) | |
| tree | fe687ef29b96f5c4cc8e95bcae0bfb455cef50df /indra/newview/lltoolpie.cpp | |
| parent | cfdd0c6faedfb8f93af7059bb61ae6dc8f8a1c69 (diff) | |
| parent | 4d77d3cca1c932516781222e0c8c14d27f876466 (diff) | |
merge
Diffstat (limited to 'indra/newview/lltoolpie.cpp')
| -rw-r--r-- | indra/newview/lltoolpie.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp index b0d9bd5d70..3cd761b73b 100644 --- a/indra/newview/lltoolpie.cpp +++ b/indra/newview/lltoolpie.cpp @@ -312,7 +312,7 @@ BOOL LLToolPie::handleLeftClickPick() // Switch to grab tool if physical or triggerable if (object && !object->isAvatar() && - ((object->usePhysics() || (parent && !parent->isAvatar() && parent->usePhysics())) || touchable) + ((object->flagUsePhysics() || (parent && !parent->isAvatar() && parent->flagUsePhysics())) || touchable) ) { gGrabTransientTool = this; @@ -596,8 +596,8 @@ BOOL LLToolPie::handleHover(S32 x, S32 y, MASK mask) lldebugst(LLERR_USER_INPUT) << "hover handled by LLToolPie (inactive)" << llendl; } - else if ((object && !object->isAvatar() && object->usePhysics()) - || (parent && !parent->isAvatar() && parent->usePhysics())) + else if ((object && !object->isAvatar() && object->flagUsePhysics()) + || (parent && !parent->isAvatar() && parent->flagUsePhysics())) { show_highlight = true; gViewerWindow->setCursor(UI_CURSOR_TOOLGRAB); |