diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-17 12:39:49 +0100 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-17 12:39:49 +0100 |
commit | 689fdd553c38ddef9c33f90c0b408bb2e9299742 (patch) | |
tree | b64aae5890112fe3c14c86acddc66cd872dcf223 /indra/newview/lltoolpie.cpp | |
parent | 14f3b77b9c4103f324d24625bd30dd106ab1817f (diff) | |
parent | 3f10caafc07b0d1a60d2b943684e87dec265f5bc (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()) { |