diff options
| author | Jon Wolk <jwolk@lindenlab.com> | 2007-01-10 21:54:56 +0000 |
|---|---|---|
| committer | Jon Wolk <jwolk@lindenlab.com> | 2007-01-10 21:54:56 +0000 |
| commit | 0fe36daf5636db0e3d1efad7824419924704eaf0 (patch) | |
| tree | 2760b820452be2b3fe421183416af3bfb8da8574 /indra/newview/llfloatertos.cpp | |
| parent | 8c344f4da02105428c5933501d028a4a8908a657 (diff) | |
svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@56631 svn+ssh://svn.lindenlab.com/svn/linden/branches/abstract-kdu@56647 --ignore-ancestry
Diffstat (limited to 'indra/newview/llfloatertos.cpp')
| -rw-r--r-- | indra/newview/llfloatertos.cpp | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/indra/newview/llfloatertos.cpp b/indra/newview/llfloatertos.cpp index c9aa9edebd..e2fa576fa9 100644 --- a/indra/newview/llfloatertos.cpp +++ b/indra/newview/llfloatertos.cpp @@ -105,7 +105,22 @@ BOOL LLFloaterTOS::postBuild() childSetAction("Continue", onContinue, this); childSetAction("Cancel", onCancel, this); childSetCommitCallback("tos_agreement", updateAgree, this); - + + // this displays the critical message + if ( mType != TOS_TOS ) + { + LLTextEditor *Editor = LLUICtrlFactory::getTextEditorByName(this, "tos_text"); + if (Editor) + { + Editor->setHandleEditKeysDirectly( TRUE ); + Editor->setEnabled( FALSE ); + Editor->setReadOnlyFgColor(LLColor4::white); + Editor->setWordWrap(TRUE); + Editor->setFocus(TRUE); + } + childSetValue("tos_text", LLSD(mMessage)); + }; + // this displays the critical message if ( mType != TOS_TOS ) { |