summaryrefslogtreecommitdiff
path: root/indra/newview/llwearable.cpp
diff options
context:
space:
mode:
authorLeyla Farazha <leyla@lindenlab.com>2010-05-25 14:22:56 -0700
committerLeyla Farazha <leyla@lindenlab.com>2010-05-25 14:22:56 -0700
commit16e3d7ebf56731c5e9ff40b92eff427316c65103 (patch)
tree62552614f1314f4d3bb96ef133b9659bdae89e16 /indra/newview/llwearable.cpp
parent1bd6061ff57a46293d962adf8ffa5326f87a3566 (diff)
parenta91d10dc1806d1931c7f1361bfcf70df59d982d5 (diff)
Merge
Diffstat (limited to 'indra/newview/llwearable.cpp')
-rw-r--r--indra/newview/llwearable.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/llwearable.cpp b/indra/newview/llwearable.cpp
index 28613c8bcf..6c27aefebb 100644
--- a/indra/newview/llwearable.cpp
+++ b/indra/newview/llwearable.cpp
@@ -759,12 +759,12 @@ void LLWearable::copyDataFrom(const LLWearable* src)
LLViewerFetchedTexture *image = NULL;
if(iter != src->mTEMap.end())
{
- image = src->getConstLocalTextureObject(te)->getImage();
- image_id = src->getConstLocalTextureObject(te)->getID();
+ image = src->getLocalTextureObject(te)->getImage();
+ image_id = src->getLocalTextureObject(te)->getID();
mTEMap[te] = new LLLocalTextureObject(image, image_id);
mSavedTEMap[te] = new LLLocalTextureObject(image, image_id);
- mTEMap[te]->setBakedReady(src->getConstLocalTextureObject(te)->getBakedReady());
- mTEMap[te]->setDiscard(src->getConstLocalTextureObject(te)->getDiscard());
+ mTEMap[te]->setBakedReady(src->getLocalTextureObject(te)->getBakedReady());
+ mTEMap[te]->setDiscard(src->getLocalTextureObject(te)->getDiscard());
}
else
{
@@ -809,7 +809,7 @@ LLLocalTextureObject* LLWearable::getLocalTextureObject(S32 index)
return NULL;
}
-const LLLocalTextureObject* LLWearable::getConstLocalTextureObject(S32 index) const
+const LLLocalTextureObject* LLWearable::getLocalTextureObject(S32 index) const
{
te_map_t::const_iterator iter = mTEMap.find(index);
if( iter != mTEMap.end() )