diff options
| author | Logan Dethrow <log@lindenlab.com> | 2011-10-12 14:40:49 -0400 |
|---|---|---|
| committer | Logan Dethrow <log@lindenlab.com> | 2011-10-12 14:40:49 -0400 |
| commit | ad3ffeed867145693500daf903c581b91b1dfcb5 (patch) | |
| tree | 43815c43b04b3afe29b54993193b2863949984c3 /indra/llxml | |
| parent | 6fae13579eccf64959451a3aab1b77fa2ac02155 (diff) | |
| parent | aabdbeadf53b3a20b4db563a23535af74fd7d4b7 (diff) | |
Merge
Diffstat (limited to 'indra/llxml')
| -rw-r--r-- | indra/llxml/llcontrol.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llxml/llcontrol.h b/indra/llxml/llcontrol.h index 050d4b729f..bf38a8b062 100644 --- a/indra/llxml/llcontrol.h +++ b/indra/llxml/llcontrol.h @@ -185,9 +185,10 @@ protected: ctrl_name_table_t mNameTable; std::string mTypeString[TYPE_COUNT]; +public: eControlType typeStringToEnum(const std::string& typestr); std::string typeEnumToString(eControlType typeenum); -public: + LLControlGroup(const std::string& name); ~LLControlGroup(); void cleanup(); |