livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

EXT-7438 FIXED INFRASTRUCTURE Fix up llwearable.h to use standard C++ coding methodology 

Had three different versions of the same function, one which didn't even have an implementation.  Collapsed these down to two and use function overloading to have them use the same name.
meow-7.2.2
Loren Shih 2010-05-21 13:21:52 -04:00
parent a4c364561b
commit 794fef8349
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
indra/newview/llwearable.cpp
View File

@ -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() )

3
indra/newview/llwearable.h
View File

@ -81,7 +81,6 @@ public:
const std::string& getTypeLabel() const;
const std::string& getTypeName() const;
LLAssetType::EType getAssetType() const;
LLLocalTextureObject* getLocalTextureObject(S32 index) const;
S32 getDefinitionVersion() const { return mDefinitionVersion; }
void setDefinitionVersion( S32 new_version ) { mDefinitionVersion = new_version; }
@ -112,7 +111,7 @@ public:
void setItemID(const LLUUID& item_id);
LLLocalTextureObject* getLocalTextureObject(S32 index);
const LLLocalTextureObject* getConstLocalTextureObject(S32 index) const;
const LLLocalTextureObject* getLocalTextureObject(S32 index) const;
void setLocalTextureObject(S32 index, LLLocalTextureObject &lto);
void addVisualParam(LLVisualParam *param);