diff options
| author | Richard Nelson <richard@lindenlab.com> | 2007-02-24 01:47:17 +0000 |
|---|---|---|
| committer | Richard Nelson <richard@lindenlab.com> | 2007-02-24 01:47:17 +0000 |
| commit | 663fff7c3f969c1435417d2a700d06ebaf744f1b (patch) | |
| tree | 719500cb73231e93a4941f34db743142c384e76d /indra/newview/llfloatertos.cpp | |
| parent | bb2b96d6c34974c9bf4a57a277e6ff182e8d137d (diff) | |
svn merge -r 58007:58273 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
Diffstat (limited to 'indra/newview/llfloatertos.cpp')
| -rw-r--r-- | indra/newview/llfloatertos.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/newview/llfloatertos.cpp b/indra/newview/llfloatertos.cpp index e2fa576fa9..34f394610f 100644 --- a/indra/newview/llfloatertos.cpp +++ b/indra/newview/llfloatertos.cpp @@ -144,13 +144,20 @@ BOOL LLFloaterTOS::postBuild() tos_agreement->setEnabled( false ); }; + // hide the SL text widget if we're displaying TOS with using a browser widget. + LLTextEditor *editor = LLUICtrlFactory::getTextEditorByName(this, "tos_text"); + if ( editor ) + { + editor->setVisible( FALSE ); + }; + LLWebBrowserCtrl* web_browser = LLUICtrlFactory::getWebBrowserCtrlByName(this, "tos_html"); if ( web_browser ) { // start to observe it so we see navigate complete events if ( web_browser ) { - web_browser->addObserver( this ); + web_browser->addObserver( this ); }; gResponsePtr = LLIamHere::build( this ); |