diff options
| author | Kitty Barnett <develop@catznip.com> | 2013-05-10 10:50:50 +0200 |
|---|---|---|
| committer | Kitty Barnett <develop@catznip.com> | 2013-05-10 10:50:50 +0200 |
| commit | 269b8b7de53f368791fbffde8a6f8d47d9cbbcdc (patch) | |
| tree | ecf0e433fb897a2e30d1e283004e8cdb69c0fbbc /indra/newview/llselectmgr.cpp | |
| parent | d8f2ecd5b3f0cb8475fa1d092cc7a315ca1e8ca9 (diff) | |
NORSPEC-102 Rapid materials updates are not smooth to viewer which is editing the object
Diffstat (limited to 'indra/newview/llselectmgr.cpp')
| -rw-r--r-- | indra/newview/llselectmgr.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp index 5089570319..8ef56af379 100644 --- a/indra/newview/llselectmgr.cpp +++ b/indra/newview/llselectmgr.cpp @@ -816,6 +816,7 @@ void LLSelectMgr::addAsFamily(std::vector<LLViewerObject*>& objects, BOOL add_to if (objectp->getNumTEs() > 0) { nodep->selectAllTEs(TRUE); + objectp->setAllTESelected(true); } else { @@ -873,10 +874,12 @@ void LLSelectMgr::addAsIndividual(LLViewerObject *objectp, S32 face, BOOL undoab else if (face == SELECT_ALL_TES) { nodep->selectAllTEs(TRUE); + objectp->setAllTESelected(true); } else if (0 <= face && face < SELECT_MAX_TES) { nodep->selectTE(face, TRUE); + objectp->setTESelected(face, true); } else { @@ -1096,6 +1099,7 @@ LLObjectSelectionHandle LLSelectMgr::selectHighlightedObjects() // flag this object as selected objectp->setSelected(TRUE); + objectp->setAllTESelected(true); mSelectedObjects->mSelectType = getSelectTypeForObject(objectp); @@ -1321,6 +1325,7 @@ void LLSelectMgr::remove(LLViewerObject *objectp, S32 te, BOOL undoable) if (nodep->isTESelected(te)) { nodep->selectTE(te, FALSE); + objectp->setTESelected(te, false); } else { @@ -5751,6 +5756,7 @@ void LLSelectNode::selectTE(S32 te_index, BOOL selected) { return; } + S32 mask = 0x1 << te_index; if(selected) { |