diff options
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llfloatertos.cpp | 17 | ||||
| -rw-r--r-- | indra/newview/llviewerprecompiledheaders.h | 16 | ||||
| -rw-r--r-- | indra/newview/llviewertexteditor.h | 1 |
3 files changed, 25 insertions, 9 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 ) { diff --git a/indra/newview/llviewerprecompiledheaders.h b/indra/newview/llviewerprecompiledheaders.h index 76efdb8595..a2ef97fc6b 100644 --- a/indra/newview/llviewerprecompiledheaders.h +++ b/indra/newview/llviewerprecompiledheaders.h @@ -102,19 +102,19 @@ #include "u64.h" // Library includes from llimage -#include "kdc_flow_control.h" -#include "kde_flow_control.h" -#include "kdu_image.h" -#include "kdu_image_local.h" -#include "llblockdata.h" -#include "llblockdecoder.h" -#include "llblockencoder.h" +//#include "kdc_flow_control.h" +//#include "kde_flow_control.h" +//#include "kdu_image.h" +//#include "kdu_image_local.h" +//#include "llblockdata.h" +//#include "llblockdecoder.h" +//#include "llblockencoder.h" #include "llimage.h" #include "llimagebmp.h" #include "llimagej2c.h" #include "llimagejpeg.h" #include "llimagetga.h" -#include "llkdumem.h" +//#include "llkdumem.h" #include "llmapimagetype.h" // Library includes from llmath project diff --git a/indra/newview/llviewertexteditor.h b/indra/newview/llviewertexteditor.h index b537d07ffa..99e971b33c 100644 --- a/indra/newview/llviewertexteditor.h +++ b/indra/newview/llviewertexteditor.h @@ -12,6 +12,7 @@ #include "lltexteditor.h" class LLInventoryItem; +class LLEmbeddedItems; // |