diff options
author | Jacek Antonelli | 2009-04-30 13:04:20 -0500 |
---|---|---|
committer | Jacek Antonelli | 2009-04-30 13:07:16 -0500 |
commit | ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e (patch) | |
tree | 8348301d0ac44a524f1819b777686bf086907d76 /linden/indra/newview/llfloaterscriptdebug.cpp | |
parent | Second Life viewer sources 1.22.11 (diff) | |
download | meta-impy-ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e.zip meta-impy-ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e.tar.gz meta-impy-ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e.tar.bz2 meta-impy-ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e.tar.xz |
Second Life viewer sources 1.23.0-RC
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llfloaterscriptdebug.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/linden/indra/newview/llfloaterscriptdebug.cpp b/linden/indra/newview/llfloaterscriptdebug.cpp index efb1da6..bc774e7 100644 --- a/linden/indra/newview/llfloaterscriptdebug.cpp +++ b/linden/indra/newview/llfloaterscriptdebug.cpp | |||
@@ -17,7 +17,8 @@ | |||
17 | * There are special exceptions to the terms and conditions of the GPL as | 17 | * There are special exceptions to the terms and conditions of the GPL as |
18 | * it is applied to this Source Code. View the full text of the exception | 18 | * it is applied to this Source Code. View the full text of the exception |
19 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 19 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
20 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception | 20 | * online at |
21 | * http://secondlifegrid.net/programs/open_source/licensing/flossexception | ||
21 | * | 22 | * |
22 | * By copying, modifying or distributing this software, you acknowledge | 23 | * By copying, modifying or distributing this software, you acknowledge |
23 | * that you have read and understood your obligations described above, | 24 | * that you have read and understood your obligations described above, |
@@ -173,7 +174,7 @@ LLFloaterScriptDebugOutput::LLFloaterScriptDebugOutput(const LLUUID& object_id) | |||
173 | getRect().getWidth() - LLFLOATER_HPAD, | 174 | getRect().getWidth() - LLFLOATER_HPAD, |
174 | LLFLOATER_VPAD ); | 175 | LLFLOATER_VPAD ); |
175 | mHistoryEditor = new LLViewerTextEditor( std::string("Chat History Editor"), | 176 | mHistoryEditor = new LLViewerTextEditor( std::string("Chat History Editor"), |
176 | history_editor_rect, S32_MAX, LLStringUtil::null, LLFontGL::sSansSerif); | 177 | history_editor_rect, S32_MAX, LLStringUtil::null, LLFontGL::getFontSansSerif()); |
177 | mHistoryEditor->setWordWrap( TRUE ); | 178 | mHistoryEditor->setWordWrap( TRUE ); |
178 | mHistoryEditor->setFollowsAll(); | 179 | mHistoryEditor->setFollowsAll(); |
179 | mHistoryEditor->setEnabled( FALSE ); | 180 | mHistoryEditor->setEnabled( FALSE ); |
@@ -196,7 +197,7 @@ void LLFloaterScriptDebugOutput::initFloater(const std::string& title, BOOL resi | |||
196 | getRect().getWidth() - LLFLOATER_HPAD, | 197 | getRect().getWidth() - LLFLOATER_HPAD, |
197 | LLFLOATER_VPAD ); | 198 | LLFLOATER_VPAD ); |
198 | mHistoryEditor = new LLViewerTextEditor( std::string("Chat History Editor"), | 199 | mHistoryEditor = new LLViewerTextEditor( std::string("Chat History Editor"), |
199 | history_editor_rect, S32_MAX, LLStringUtil::null, LLFontGL::sSansSerif); | 200 | history_editor_rect, S32_MAX, LLStringUtil::null, LLFontGL::getFontSansSerif()); |
200 | mHistoryEditor->setWordWrap( TRUE ); | 201 | mHistoryEditor->setWordWrap( TRUE ); |
201 | mHistoryEditor->setFollowsAll(); | 202 | mHistoryEditor->setFollowsAll(); |
202 | mHistoryEditor->setEnabled( FALSE ); | 203 | mHistoryEditor->setEnabled( FALSE ); |