diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2009-08-05 16:10:15 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2009-08-05 16:10:15 -0400 |
| commit | 07129bf928f79246849e66b396fab44a7a228216 (patch) | |
| tree | e4e19b342540450ff84dad75f90d5acb5b3d6269 /indra/newview/llvotree.cpp | |
| parent | 03ebc43132331b9a8dcb3c418ec9c319a6beddda (diff) | |
| parent | dc62495da6e5c153c0df57fdbce6b0f40c0208f2 (diff) | |
Merge recent changes
Diffstat (limited to 'indra/newview/llvotree.cpp')
| -rw-r--r-- | indra/newview/llvotree.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llvotree.cpp b/indra/newview/llvotree.cpp index b602b93025..d1cac4c77e 100644 --- a/indra/newview/llvotree.cpp +++ b/indra/newview/llvotree.cpp @@ -48,7 +48,7 @@ #include "lldrawable.h" #include "llface.h" #include "llviewercamera.h" -#include "llviewerimagelist.h" +#include "llviewertexturelist.h" #include "llviewerobjectlist.h" #include "llviewerregion.h" #include "llworld.h" @@ -311,10 +311,10 @@ U32 LLVOTree::processUpdateMessage(LLMessageSystem *mesgsys, // // Load Species-Specific data // - mTreeImagep = gImageList.getImage(sSpeciesTable[mSpecies]->mTextureID); + mTreeImagep = LLViewerTextureManager::getFetchedTexture(sSpeciesTable[mSpecies]->mTextureID, TRUE, FALSE, LLViewerTexture::LOD_TEXTURE); if (mTreeImagep) { - gGL.getTexUnit(0)->bind(mTreeImagep.get()); + gGL.getTexUnit(0)->bind(mTreeImagep); } mBranchLength = sSpeciesTable[mSpecies]->mBranchLength; mTrunkLength = sSpeciesTable[mSpecies]->mTrunkLength; |