diff options
| author | McCabe Maxsted | 2011-04-10 19:47:49 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2011-04-10 19:47:49 -0700 |
| commit | 66291513de96bf971e770089097bddb4a828259b (patch) | |
| tree | 98d73ac38ffe39658a06133779140d37db7a1585 /linden/indra | |
| parent | Fixed Mhz -> MHz, ported from Singularity, patch by Shyotl (diff) | |
| download | meta-impy-66291513de96bf971e770089097bddb4a828259b.zip meta-impy-66291513de96bf971e770089097bddb4a828259b.tar.gz meta-impy-66291513de96bf971e770089097bddb4a828259b.tar.bz2 meta-impy-66291513de96bf971e770089097bddb4a828259b.tar.xz | |
Little bit of cleanup for pie menu hud
Diffstat (limited to '')
| -rw-r--r-- | linden/indra/newview/lltoolpie.cpp | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/linden/indra/newview/lltoolpie.cpp b/linden/indra/newview/lltoolpie.cpp index b7d762c..a70169c 100644 --- a/linden/indra/newview/lltoolpie.cpp +++ b/linden/indra/newview/lltoolpie.cpp | |||
| @@ -422,13 +422,16 @@ BOOL LLToolPie::pickAndShowMenu(BOOL always_show) | |||
| 422 | } | 422 | } |
| 423 | // [/RLVa:KB] | 423 | // [/RLVa:KB] |
| 424 | } | 424 | } |
| 425 | else if (object->isAttachment() && !object->isHUDAttachment()) | 425 | else if (object->isAttachment()) |
| 426 | { | 426 | { |
| 427 | gPieAttachment->show(x, y, mPieMouseButtonDown); | 427 | if (object->isHUDAttachment()) |
| 428 | } | 428 | { |
| 429 | else if (object->isHUDAttachment()) | 429 | gPieHUD->show(x, y, mPieMouseButtonDown); |
| 430 | { | 430 | } |
| 431 | gPieHUD->show(x, y, mPieMouseButtonDown); | 431 | else |
| 432 | { | ||
| 433 | gPieAttachment->show(x, y, mPieMouseButtonDown); | ||
| 434 | } | ||
| 432 | } | 435 | } |
| 433 | else | 436 | else |
| 434 | { | 437 | { |