diff options
Diffstat (limited to 'indra/newview/llappearance.h')
| -rw-r--r-- | indra/newview/llappearance.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/newview/llappearance.h b/indra/newview/llappearance.h index 2a4c1759ca..07c0c0cb68 100644 --- a/indra/newview/llappearance.h +++ b/indra/newview/llappearance.h @@ -32,24 +32,24 @@ #ifndef LL_LLAPPEARANCE_H #define LL_LLAPPEARANCE_H -#include "llskiplist.h" #include "lluuid.h" class LLAppearance { public: LLAppearance() {} - ~LLAppearance() { mParamMap.deleteAllData(); } + ~LLAppearance() { mParamMap.clear(); } - void addParam( S32 id, F32 value ) { mParamMap.addData( id, new F32(value) ); } - F32* getParam( S32 id ) { F32* temp = mParamMap.getIfThere( id ); return temp; } // temp works around an invalid warning. + void addParam( S32 id, F32 value ) { mParamMap[id] = value; } + F32 getParam( S32 id, F32 defval ) { return get_if_there(mParamMap, id, defval ); } void addTexture( S32 te, const LLUUID& uuid ) { if( te < LLVOAvatar::TEX_NUM_ENTRIES ) mTextures[te] = uuid; } const LLUUID& getTexture( S32 te ) { return ( te < LLVOAvatar::TEX_NUM_ENTRIES ) ? mTextures[te] : LLUUID::null; } - void clear() { mParamMap.deleteAllData(); for( S32 i=0; i<LLVOAvatar::TEX_NUM_ENTRIES; i++ ) mTextures[i].setNull(); } + void clear() { mParamMap.clear(); for( S32 i=0; i<LLVOAvatar::TEX_NUM_ENTRIES; i++ ) mTextures[i].setNull(); } - LLPtrSkipMap<S32, F32*> mParamMap; + typedef std::map<S32, F32> param_map_t; + param_map_t mParamMap; LLUUID mTextures[LLVOAvatar::TEX_NUM_ENTRIES]; }; |