diff options
| author | Graham Madarasz <graham@lindenlab.com> | 2019-08-27 16:52:22 +0000 |
|---|---|---|
| committer | Graham Madarasz <graham@lindenlab.com> | 2019-08-27 16:52:22 +0000 |
| commit | 3fe7577f5ba15477ef65637ca159e5ff92dcbade (patch) | |
| tree | 6bdf032f23906235b6c7d85554e193d5b7c56165 /indra/newview/llselectmgr.cpp | |
| parent | f79fc96d08e37f119653f7db5a299a05454ff79c (diff) | |
| parent | 2cd01c8e92e2ecf4402a3a075ec8bdc6a8f20470 (diff) | |
Merged in graham_linden/viewer-eep-g (pull request #486)
Default
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 74022cee01..816515426a 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)); + } } } |