diff options
author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-04-19 16:17:18 +0300 |
---|---|---|
committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-04-19 16:17:18 +0300 |
commit | 0756770e79f69496153d74e72e41a46206889ea5 (patch) | |
tree | 022b38c2c11d37aac3be88d9ea13229904709549 /indra/newview/lltoolpie.cpp | |
parent | 59d296e2008847b944678f6e3b873435e6d5f826 (diff) | |
parent | 3f10caafc07b0d1a60d2b943684e87dec265f5bc (diff) |
Merge from default branch
--HG--
branch : product-engine
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()) { |