diff options
| author | McCabe Maxsted | 2009-02-25 01:09:07 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2009-02-25 01:09:07 -0700 |
| commit | fdf4d97d4d9ce64eee4142e491509106be5b716b (patch) | |
| tree | 18ea2f2bf7a312de623635326872996355a411ec /linden/indra/newview/lltoolpie.cpp | |
| parent | Changed the show/hide shortcuts to be linux friendly (diff) | |
| download | meta-impy-fdf4d97d4d9ce64eee4142e491509106be5b716b.zip meta-impy-fdf4d97d4d9ce64eee4142e491509106be5b716b.tar.gz meta-impy-fdf4d97d4d9ce64eee4142e491509106be5b716b.tar.bz2 meta-impy-fdf4d97d4d9ce64eee4142e491509106be5b716b.tar.xz | |
Added menu_pie_hud.xml, removed legacy rate pie menu references
Diffstat (limited to 'linden/indra/newview/lltoolpie.cpp')
| -rw-r--r-- | linden/indra/newview/lltoolpie.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/linden/indra/newview/lltoolpie.cpp b/linden/indra/newview/lltoolpie.cpp index de10045..63b6e34 100644 --- a/linden/indra/newview/lltoolpie.cpp +++ b/linden/indra/newview/lltoolpie.cpp | |||
| @@ -336,10 +336,14 @@ BOOL LLToolPie::pickAndShowMenu(BOOL always_show) | |||
| 336 | 336 | ||
| 337 | gPieAvatar->show(x, y, mPieMouseButtonDown); | 337 | gPieAvatar->show(x, y, mPieMouseButtonDown); |
| 338 | } | 338 | } |
| 339 | else if (object->isAttachment()) | 339 | else if (object->isAttachment() && !object->isHUDAttachment()) |
| 340 | { | 340 | { |
| 341 | gPieAttachment->show(x, y, mPieMouseButtonDown); | 341 | gPieAttachment->show(x, y, mPieMouseButtonDown); |
| 342 | } | 342 | } |
| 343 | else if (object->isHUDAttachment()) | ||
| 344 | { | ||
| 345 | gPieHUD->show(x, y, mPieMouseButtonDown); | ||
| 346 | } | ||
| 343 | else | 347 | else |
| 344 | { | 348 | { |
| 345 | // BUG: What about chatting child objects? | 349 | // BUG: What about chatting child objects? |