diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2011-09-06 13:58:47 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2011-09-06 13:58:47 -0400 |
| commit | b59c0a668009e696295a194e118b91469b09d32e (patch) | |
| tree | 4ffc7e9f547e941b254a67d5b07ab22c0dfd1346 /indra/llxml | |
| parent | 0ab6eee0996c78d32b722157140cea5a21a5e460 (diff) | |
| parent | ecba41419f6470cc3d85bbb277ef88ebbf266feb (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(); |