diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-09-05 21:53:24 +0300 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-09-05 21:53:24 +0300 |
| commit | 05f1e3e7138c4eca27d4047bd9727a4fba0c9dc0 (patch) | |
| tree | 2605fa5718b239f2de3312e7a6026073ca9d38cd /indra/newview/llselectmgr.cpp | |
| parent | 823cef92ed9f22943888172f35b88f1a8efa0d8b (diff) | |
| parent | e8194e6aba4394930868f9b883192f2ec0b4e710 (diff) | |
Merged in lindenlab/viewer-lynx
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 715559d886..90f8f84ea4 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) ; // @@ -1656,6 +1657,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; } }; @@ -1855,6 +1857,7 @@ BOOL LLSelectMgr::selectionRevertTextures() else { object->setTEImage(te, LLViewerTextureManager::getFetchedTexture(id, FTT_DEFAULT, TRUE, LLGLTexture::BOOST_NONE, LLViewerTexture::LOD_TEXTURE)); + } } } |