diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2017-11-08 19:56:09 +0000 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2017-11-08 19:56:09 +0000 |
| commit | c7a0b25977a5ca30fc1726370f6363349ff9f836 (patch) | |
| tree | a0f005c212bffe32e6db5c42542dfc272a3c525d /indra/newview/llselectmgr.cpp | |
| parent | 14f429329f5e9c570ff4e79f177f3bb8d0471252 (diff) | |
SL-831 - animesh objects are not required to have any tris. If they have no tris, we don't bother making a control avatar for them.
Diffstat (limited to 'indra/newview/llselectmgr.cpp')
| -rw-r--r-- | indra/newview/llselectmgr.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp index e8b2d1ec8c..f666f447cb 100644 --- a/indra/newview/llselectmgr.cpp +++ b/indra/newview/llselectmgr.cpp @@ -691,7 +691,7 @@ bool LLSelectMgr::enableLinkObjects() new_value = LLSelectMgr::getInstance()->getSelection()->applyToRootObjects(&func, firstonly); } } - if (!LLSelectMgr::getInstance()->getSelection()->checkAnimatedObjectLinkable()) + if (!LLSelectMgr::getInstance()->getSelection()->checkAnimatedObjectEstTris()) { new_value = false; } @@ -7451,6 +7451,7 @@ bool LLObjectSelection::checkAnimatedObjectEstTris() bool LLObjectSelection::checkAnimatedObjectLinkable() { + LL_ERRS() << "Not using this restriction" << LL_ENDL; // Can't link if any of the roots is currently an animated object for (root_iterator iter = root_begin(); iter != root_end(); ++iter) { |