diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-12-02 12:07:32 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-12-02 12:07:32 -0500 |
| commit | 3c2db0d1792f8474b26e2adaebff6f32e4f62ff7 (patch) | |
| tree | d62a5928d6a88ffffeac198eb201975c499f6a95 /indra/newview/llpanelface.cpp | |
| parent | f18c381d1af129002d1c364eb525b52e42d70e7d (diff) | |
| parent | d06c9fba902b16db6906790bab349c6a01fc04ad (diff) | |
Automated merge
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; |