diff options
| author | Jacek Antonelli | 2009-09-23 02:29:44 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2009-09-23 02:29:44 -0500 |
| commit | cd2b97b3e6446449443700ae9a1521c402c93850 (patch) | |
| tree | 0c45e5a05cdcb6956fb859c9fef834a5c5613a04 /linden/indra/newview/lltoolpie.cpp | |
| parent | Commented out Linux tarball building. (diff) | |
| parent | Display selected avatars larger than normal, zoom in at a reasonable speed. I... (diff) | |
| download | meta-impy-cd2b97b3e6446449443700ae9a1521c402c93850.zip meta-impy-cd2b97b3e6446449443700ae9a1521c402c93850.tar.gz meta-impy-cd2b97b3e6446449443700ae9a1521c402c93850.tar.bz2 meta-impy-cd2b97b3e6446449443700ae9a1521c402c93850.tar.xz | |
Merge remote branch 'mccabe/1.2.0-next' into next
Conflicts:
linden/indra/newview/llfloaterchat.cpp
linden/indra/newview/llfloatermap.cpp
linden/indra/newview/llinventorybridge.cpp
linden/indra/newview/llnetmap.cpp
linden/indra/newview/llviewermessage.cpp
linden/indra/newview/llviewerobjectlist.cpp
Diffstat (limited to 'linden/indra/newview/lltoolpie.cpp')
| -rw-r--r-- | linden/indra/newview/lltoolpie.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/linden/indra/newview/lltoolpie.cpp b/linden/indra/newview/lltoolpie.cpp index 5a21992..b32169d 100644 --- a/linden/indra/newview/lltoolpie.cpp +++ b/linden/indra/newview/lltoolpie.cpp | |||
| @@ -191,7 +191,7 @@ BOOL LLToolPie::pickAndShowMenu(BOOL always_show) | |||
| 191 | // nothing | 191 | // nothing |
| 192 | break; | 192 | break; |
| 193 | case CLICK_ACTION_SIT: | 193 | case CLICK_ACTION_SIT: |
| 194 | if ((gAgent.getAvatarObject() != NULL) && (!gAgent.getAvatarObject()->mIsSitting)) // agent not already sitting | 194 | if ((gAgent.getAvatarObject() != NULL) && (!gAgent.getAvatarObject()->mIsSitting) && !gSavedSettings.getBOOL("BlockClickSit")) // agent not already sitting |
| 195 | { | 195 | { |
| 196 | handle_sit_or_stand(); | 196 | handle_sit_or_stand(); |
| 197 | return TRUE; | 197 | return TRUE; |
| @@ -687,9 +687,10 @@ BOOL LLToolPie::handleDoubleClick(S32 x, S32 y, MASK mask) | |||
| 687 | else if (mPick.mObjectID.notNull() | 687 | else if (mPick.mObjectID.notNull() |
| 688 | && !mPick.mPosGlobal.isExactlyZero()) | 688 | && !mPick.mPosGlobal.isExactlyZero()) |
| 689 | { | 689 | { |
| 690 | // Hit an object | 690 | //Zwagoth: No more teleport to HUD attachments. >:o |
| 691 | // HACK: Call the last hit position the point we hit on the object | 691 | if(mPick.getObject().notNull() && mPick.getObject()->isHUDAttachment()) |
| 692 | //gLastHitPosGlobal += gLastHitObjectOffset; | 692 | return FALSE; |
| 693 | |||
| 693 | handle_go_to(); | 694 | handle_go_to(); |
| 694 | return TRUE; | 695 | return TRUE; |
| 695 | } | 696 | } |