diff options
| author | Richard Linden <none@none> | 2011-10-15 18:14:49 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-10-15 18:14:49 -0700 |
| commit | 4aed73ceb18c656e0f36c91bd0efb9a705341629 (patch) | |
| tree | 013b1382be366aa2a9d1caf7bb563e04f7d8b2ed /indra/llxml | |
| parent | 7c2f2b526ad2b33f1e25378b5a05379de6aa0b5a (diff) | |
| parent | 62d9db2f21b2a6fb579e8f7631a4e387cc5e5b29 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-fui
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(); |