diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-09-05 21:55:56 +0300 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-09-05 21:55:56 +0300 |
| commit | cd895d6e583f42349ca3bc330d82c66740ce08ab (patch) | |
| tree | 4367d6ee2d3d3e9df896ad25501d80446aef32ba /indra/newview/llselectmgr.cpp | |
| parent | 23acff80c083c442edddbe3fbb1754d640496704 (diff) | |
| parent | 05f1e3e7138c4eca27d4047bd9727a4fba0c9dc0 (diff) | |
Merged in lindenlab/viewer-bear
Diffstat (limited to 'indra/newview/llselectmgr.cpp')
| -rw-r--r-- | indra/newview/llselectmgr.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp index 26984ca1dc..f849fecaf6 100644 --- a/indra/newview/llselectmgr.cpp +++ b/indra/newview/llselectmgr.cpp @@ -96,6 +96,7 @@ #include "llviewershadermgr.h" #include "llpanelface.h" #include "llglheaders.h" +#include "llinventoryobserver.h" LLViewerObject* getSelectedParentObject(LLViewerObject *object) ; // @@ -1703,6 +1704,7 @@ void LLSelectMgr::selectionSetImage(const LLUUID& imageid) // * Can just apply the texture and be done with it. objectp->setTEImage(te, LLViewerTextureManager::getFetchedTexture(mImageID, FTT_DEFAULT, TRUE, LLGLTexture::BOOST_NONE, LLViewerTexture::LOD_TEXTURE)); } + return true; } }; @@ -1902,6 +1904,7 @@ BOOL LLSelectMgr::selectionRevertTextures() else { object->setTEImage(te, LLViewerTextureManager::getFetchedTexture(id, FTT_DEFAULT, TRUE, LLGLTexture::BOOST_NONE, LLViewerTexture::LOD_TEXTURE)); + } } } |