diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-10-10 15:32:57 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-10-10 15:32:57 -0400 |
| commit | d65d451448573f95b065a9be7c88ff239d5ed8be (patch) | |
| tree | 7734e1017a9bb81f4073ffa7839bba39dbde7ab1 /indra/llxml | |
| parent | 22795e0a8da1bd99a5bb0e4df62b684eb2fc3931 (diff) | |
| parent | a15701de33007f60994181d8e7300d1e624de373 (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(); |