summaryrefslogtreecommitdiff
path: root/indra/llcharacter/llcharacter.h
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2009-10-21 21:37:27 +0000
committerLoren Shih <seraph@lindenlab.com>2009-10-21 21:37:27 +0000
commit5164ed388c1e328cb80dec304ba2fd249ef662f4 (patch)
treedf6f0f691faa1fae32f376a7b0c582127b7f2507 /indra/llcharacter/llcharacter.h
parentb3d1eb82fadbf3a098abb49d2ef23cade4c6fe95 (diff)
Code audit for r136515 ("merging in new wearable infrastructure...")
No expected functionality change; this mostly contains cosmetic cleanup. Reviewed by: Nyx
Diffstat (limited to 'indra/llcharacter/llcharacter.h')
-rw-r--r--indra/llcharacter/llcharacter.h15
1 files changed, 8 insertions, 7 deletions
diff --git a/indra/llcharacter/llcharacter.h b/indra/llcharacter/llcharacter.h
index 1507686f67..cb44a32e8a 100644
--- a/indra/llcharacter/llcharacter.h
+++ b/indra/llcharacter/llcharacter.h
@@ -233,12 +233,12 @@ public:
LLVisualParam* getVisualParam(S32 id) const
{
- VisualParamIndexMap_t::const_iterator iter = mVisualParamIndexMap.find(id);
+ visual_param_index_map_t::const_iterator iter = mVisualParamIndexMap.find(id);
return (iter == mVisualParamIndexMap.end()) ? 0 : iter->second;
}
S32 getVisualParamID(LLVisualParam *id)
{
- VisualParamIndexMap_t::iterator iter;
+ visual_param_index_map_t::iterator iter;
for (iter = mVisualParamIndexMap.begin(); iter != mVisualParamIndexMap.end(); iter++)
{
if (iter->second == id)
@@ -276,11 +276,12 @@ protected:
private:
// visual parameter stuff
- typedef std::map<S32, LLVisualParam *> VisualParamIndexMap_t;
- VisualParamIndexMap_t mVisualParamIndexMap;
- VisualParamIndexMap_t::iterator mCurIterator;
- typedef std::map<char *, LLVisualParam *> VisualParamNameMap_t;
- VisualParamNameMap_t mVisualParamNameMap;
+ typedef std::map<S32, LLVisualParam *> visual_param_index_map_t;
+ typedef std::map<char *, LLVisualParam *> visual_param_name_map_t;
+
+ visual_param_index_map_t::iterator mCurIterator;
+ visual_param_index_map_t mVisualParamIndexMap;
+ visual_param_name_map_t mVisualParamNameMap;
static LLStringTable sVisualParamNames;
};