diff options
| author | Oz Linden <oz@lindenlab.com> | 2016-03-23 11:50:39 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2016-03-23 11:50:39 -0400 |
| commit | 518f92126f18d5f4b8ee8eb287500fe5a7e17c99 (patch) | |
| tree | 5d58fc3ba9ec7e0f6097b0644ec65fbbebd9cfbc /indra/llxml/llcontrol.h | |
| parent | 7bbf2ec9f82c9818d02493c7b877e68ca97261fc (diff) | |
improve settings error log, and make type conversion methods static
Diffstat (limited to 'indra/llxml/llcontrol.h')
| -rw-r--r-- | 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 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(); |