diff options
Diffstat (limited to 'linden/indra/newview/lltoolpie.cpp')
-rw-r--r-- | linden/indra/newview/lltoolpie.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/linden/indra/newview/lltoolpie.cpp b/linden/indra/newview/lltoolpie.cpp index c2be831..262c349 100644 --- a/linden/indra/newview/lltoolpie.cpp +++ b/linden/indra/newview/lltoolpie.cpp | |||
@@ -373,22 +373,22 @@ BOOL LLToolPie::pickAndShowMenu(BOOL always_show) | |||
373 | //gMutePieMenu->setLabel("Mute"); | 373 | //gMutePieMenu->setLabel("Mute"); |
374 | } | 374 | } |
375 | 375 | ||
376 | // gPieAvatar->show(x, y, mPieMouseButtonDown); | ||
376 | // [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g) | Added: RLVa-0.2.0f | 377 | // [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g) | Added: RLVa-0.2.0f |
377 | #ifdef RLV_EXPERIMENTAL_FARTOUCH_FEEDBACK | 378 | #ifdef RLV_EXPERIMENTAL_FARTOUCH_FEEDBACK |
378 | // If we have an empty selection under @fartouch=n don't show the pie menu but play the "operation block" sound | 379 | // If we have an empty selection under @fartouch=n don't show the pie menu but play the "operation block" sound |
379 | if ( (!gRlvHandler.hasBehaviour(RLV_BHVR_FARTOUCH)) || (!LLSelectMgr::getInstance()->getSelection()->isEmpty()) ) | 380 | if ( (!gRlvHandler.hasBehaviour(RLV_BHVR_FARTOUCH)) || (!LLSelectMgr::getInstance()->getSelection()->isEmpty()) ) |
380 | { | 381 | { |
381 | #endif // RLV_EXPERIMENTAL_FARTOUCH_FEEDBACK | 382 | #endif // RLV_EXPERIMENTAL_FARTOUCH_FEEDBACK |
382 | gPieAvatar->show(x, y, mPieMouseButtonDown); | 383 | gPieAvatar->show(x, y, mPieMouseButtonDown); |
383 | #ifdef RLV_EXPERIMENTAL_FARTOUCH_FEEDBACK | 384 | #ifdef RLV_EXPERIMENTAL_FARTOUCH_FEEDBACK |
384 | } | 385 | } |
385 | else | 386 | else |
386 | { | 387 | { |
387 | make_ui_sound("UISndInvalidOp"); | 388 | make_ui_sound("UISndInvalidOp"); |
388 | } | 389 | } |
389 | #endif // RLV_EXPERIMENTAL_FARTOUCH_FEEDBACK | 390 | #endif // RLV_EXPERIMENTAL_FARTOUCH_FEEDBACK |
390 | // [/RLVa:KB] | 391 | // [/RLVa:KB] |
391 | |||
392 | } | 392 | } |
393 | else if (object->isAttachment() && !object->isHUDAttachment()) | 393 | else if (object->isAttachment() && !object->isHUDAttachment()) |
394 | { | 394 | { |