diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-19 14:30:43 +0100 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-19 14:30:43 +0100 |
commit | b362cc60d9f458626bc69873c5801b3dbd25aae3 (patch) | |
tree | 8c59c292a89a0b380e61d5e4f7083240c56192f0 /indra/newview/lltoolpie.cpp | |
parent | f3d4648ef5c670d519945ca72958e161d5aa12f4 (diff) | |
parent | 532d732645f2369d17eba9c2ed0d594b486d416e (diff) |
merge from viewer-trunk
Diffstat (limited to 'indra/newview/lltoolpie.cpp')
-rw-r--r-- | indra/newview/lltoolpie.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp index a9bbee784d..ae244cd8a1 100644 --- a/indra/newview/lltoolpie.cpp +++ b/indra/newview/lltoolpie.cpp @@ -1267,6 +1267,7 @@ bool LLToolPie::handleMediaClick(const LLPickInfo& pick) if (!parcel || objectp.isNull() || + objectp->isHUDAttachment() || pick.mObjectFace < 0 || pick.mObjectFace >= objectp->getNumTEs()) { |