diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2011-10-05 11:25:19 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2011-10-05 11:25:19 -0400 |
| commit | 30480b58db917e48090ae7b3c1427834875d9626 (patch) | |
| tree | fd380b1be4e8e4066efa92c283b5a317551a76f9 /indra/llxml | |
| parent | d0e36ade5bb16e9e5a6aca9ee4f02fbe995cdfd8 (diff) | |
| parent | ad9c28a2693f0e05f229697bb906216f99029bed (diff) | |
Automated merge with http://hg.secondlife.com/viewer-development
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(); |