diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-10-05 18:02:58 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-10-05 18:02:58 -0400 |
| commit | 5f38ec7f92fcea833352cd30797a9d73ef5a041f (patch) | |
| tree | 67a35e5cd822b9f630dd72fdc93e4a3749f92735 /indra/llxml/llcontrol.h | |
| parent | 194bedbb96a6dcfe90d5b731aeca8658c83f2306 (diff) | |
| parent | 30480b58db917e48090ae7b3c1427834875d9626 (diff) | |
merge changes for storm-1637
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(); |