diff options
| author | Adam Moss <moss@lindenlab.com> | 2009-09-30 17:46:31 +0000 |
|---|---|---|
| committer | Adam Moss <moss@lindenlab.com> | 2009-09-30 17:46:31 +0000 |
| commit | feabeb496518f28359f654fdc397354355743589 (patch) | |
| tree | 99fa7dd202caac786d7032a2c8bd187a1f5a5ad0 /indra/llui/llpanel.cpp | |
| parent | a3ba111e39be0bfa0278dfce66f4608fac7c0aa2 (diff) | |
DEV-35039 Viewer 2.0 Help System - Viewer Development
svn merge -r134800:134805 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer2help-3
Diffstat (limited to 'indra/llui/llpanel.cpp')
| -rw-r--r-- | indra/llui/llpanel.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/llui/llpanel.cpp b/indra/llui/llpanel.cpp index 26136e0a23..b9bbb4db22 100644 --- a/indra/llui/llpanel.cpp +++ b/indra/llui/llpanel.cpp @@ -80,6 +80,7 @@ LLPanel::Params::Params() strings("string"), filename("filename"), class_name("class"), + help_topic("help_topic"), visible_callback("visible_callback") { name = "panel"; @@ -98,6 +99,7 @@ LLPanel::LLPanel(const LLPanel::Params& p) mDefaultBtn(NULL), mBorder(NULL), mLabel(p.label), + mHelpTopic(p.help_topic), mCommitCallbackRegistrar(false), mEnableCallbackRegistrar(false), mXMLFilename(p.filename) @@ -416,6 +418,7 @@ void LLPanel::initFromParams(const LLPanel::Params& p) } setLabel(p.label()); + setHelpTopic(p.help_topic); setShape(p.rect); parseFollowsFlags(p); |