diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-10-11 13:38:19 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-10-11 13:38:19 -0400 |
| commit | f1e907ecbeb43d56066bc365a4550931dfc5e7eb (patch) | |
| tree | 5642c656a58e6c68897b6196c2991892c4009d00 /indra/llxml/llcontrol.h | |
| parent | d7f123ab526df7dbef153e0de71f325ab1b69571 (diff) | |
| parent | be251b06eb785a2d301115f9c231eb5f3c906224 (diff) | |
merge
Diffstat (limited to 'indra/llxml/llcontrol.h')
| -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(); |