diff options
author | Monroe Linden <monroe@lindenlab.com> | 2010-08-09 17:17:49 -0700 |
---|---|---|
committer | Monroe Linden <monroe@lindenlab.com> | 2010-08-09 17:17:49 -0700 |
commit | 235afd7836d74305292067cd6c29fe0192d6201d (patch) | |
tree | 2cb0f2f9c817b9f70db8e115aaf69990555210ea /indra/newview/lltoolpie.cpp | |
parent | c90a90407c30415bf9700d3b037a0b8918e261d3 (diff) | |
parent | 011c3686a6e10edfe40adb67105298033188c1d6 (diff) |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
Diffstat (limited to 'indra/newview/lltoolpie.cpp')
-rw-r--r-- | indra/newview/lltoolpie.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp index f9e7191b21..cf1dd639e1 100644 --- a/indra/newview/lltoolpie.cpp +++ b/indra/newview/lltoolpie.cpp @@ -1270,7 +1270,6 @@ bool LLToolPie::handleMediaClick(const LLPickInfo& pick) if (!parcel || objectp.isNull() || - objectp->isHUDAttachment() || pick.mObjectFace < 0 || pick.mObjectFace >= objectp->getNumTEs()) { |