diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2016-05-20 02:06:08 +0300 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2016-05-20 02:06:08 +0300 |
| commit | c50f96b49215b4279192ffc3eb336a3465a00756 (patch) | |
| tree | da923846a177ea97882dd0ba07b9235a5f0e7b8b /indra/llxml/llcontrol.h | |
| parent | d3de134da047460c68ffd7cc732e592049a1e83d (diff) | |
| parent | b25a22a2c113a1e95f2cd5d45bb5b80a756c4a80 (diff) | |
Merged in lindenlab/viewer-lynx
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(); |