diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2016-05-20 00:03:30 +0300 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2016-05-20 00:03:30 +0300 |
| commit | 445cd962932c1957495a35add8cf5ca4618e035b (patch) | |
| tree | d0303f3704acb804cb8281f3b7c38010afa423e6 /indra/llxml/llcontrol.h | |
| parent | 6f5f307e0a751a78fbdfb4c6a1f8757ea55bf1dd (diff) | |
| parent | c2ef3b4c7186dbbd95b16520f281b7d58364fb52 (diff) | |
Merged in lindenlab/viewer-release
Diffstat (limited to 'indra/llxml/llcontrol.h')
| -rw-r--r--[-rwxr-xr-x] | indra/llxml/llcontrol.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/llxml/llcontrol.h b/indra/llxml/llcontrol.h index 04575d81e0..77065dcf8d 100755..100644 --- a/indra/llxml/llcontrol.h +++ b/indra/llxml/llcontrol.h @@ -70,6 +70,7 @@ class LLVector3d; class LLColor4; class LLColor3; +// if this is changed, also modify mTypeString in llcontrol.h typedef enum e_control_type { TYPE_U32 = 0, @@ -190,11 +191,11 @@ class LLControlGroup : public LLInstanceTracker<LLControlGroup, std::string> protected: typedef std::map<std::string, LLControlVariablePtr > ctrl_name_table_t; ctrl_name_table_t mNameTable; - std::string mTypeString[TYPE_COUNT]; + static const std::string mTypeString[TYPE_COUNT]; public: - eControlType typeStringToEnum(const std::string& typestr); - std::string typeEnumToString(eControlType typeenum); + static eControlType typeStringToEnum(const std::string& typestr); + static std::string typeEnumToString(eControlType typeenum); LLControlGroup(const std::string& name); ~LLControlGroup(); |