aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/lltoolpie.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview/lltoolpie.cpp')
-rw-r--r--linden/indra/newview/lltoolpie.cpp16
1 files changed, 15 insertions, 1 deletions
diff --git a/linden/indra/newview/lltoolpie.cpp b/linden/indra/newview/lltoolpie.cpp
index 986555d..60e40dd 100644
--- a/linden/indra/newview/lltoolpie.cpp
+++ b/linden/indra/newview/lltoolpie.cpp
@@ -332,6 +332,16 @@ BOOL LLToolPie::pickAndShowMenu(BOOL always_show)
332 if (object->isAvatar() 332 if (object->isAvatar()
333 || (object->isAttachment() && !object->isHUDAttachment() && !object->permYouOwner())) 333 || (object->isAttachment() && !object->isHUDAttachment() && !object->permYouOwner()))
334 { 334 {
335 // Toggle Inspect only for attachments
336 if (object->isAttachment())
337 {
338 gMenuHolder->childSetEnabled("Avatar Inspect", TRUE);
339 }
340 else
341 {
342 gMenuHolder->childSetEnabled("Avatar Inspect", FALSE);
343 }
344
335 // Find the attachment's avatar 345 // Find the attachment's avatar
336 while( object && object->isAttachment()) 346 while( object && object->isAttachment())
337 { 347 {
@@ -354,10 +364,14 @@ BOOL LLToolPie::pickAndShowMenu(BOOL always_show)
354 364
355 gPieAvatar->show(x, y, mPieMouseButtonDown); 365 gPieAvatar->show(x, y, mPieMouseButtonDown);
356 } 366 }
357 else if (object->isAttachment()) 367 else if (object->isAttachment() && !object->isHUDAttachment())
358 { 368 {
359 gPieAttachment->show(x, y, mPieMouseButtonDown); 369 gPieAttachment->show(x, y, mPieMouseButtonDown);
360 } 370 }
371 else if (object->isHUDAttachment())
372 {
373 gPieHUD->show(x, y, mPieMouseButtonDown);
374 }
361 else 375 else
362 { 376 {
363 // BUG: What about chatting child objects? 377 // BUG: What about chatting child objects?