diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-05-17 18:47:51 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-05-17 18:47:51 -0400 |
| commit | cb936d097fd40c743895cb35fce6b292c66e5210 (patch) | |
| tree | c554c33c7576aa567ca2b32ad06ee9af83977059 /indra/newview/llpanelface.cpp | |
| parent | 32313dd3c6396324ea8f13285a69c01f38fe1cfc (diff) | |
| parent | bd37b14e9217935b9d70faf04c835c9d4aeda9c7 (diff) | |
pull back fix for STORM-1260 from beta branch
Diffstat (limited to 'indra/newview/llpanelface.cpp')
| -rw-r--r-- | indra/newview/llpanelface.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp index bce496cbad..07c7f35989 100644 --- a/indra/newview/llpanelface.cpp +++ b/indra/newview/llpanelface.cpp @@ -376,6 +376,11 @@ struct LLPanelFaceSetAlignedTEFunctor : public LLSelectedTEFunctor return true; } + if (facep->getViewerObject()->getVolume()->getNumVolumeFaces() <= te) + { + return true; + } + bool set_aligned = true; if (facep == mCenterFace) { @@ -418,6 +423,12 @@ struct LLPanelFaceGetIsAlignedTEFunctor : public LLSelectedTEFunctor { return false; } + + if (facep->getViewerObject()->getVolume()->getNumVolumeFaces() <= te) + { //volume face does not exist, can't be aligned + return false; + } + if (facep == mCenterFace) { return true; |