diff options
| author | Steve Bennetts <steve@lindenlab.com> | 2009-11-24 15:36:50 -0800 |
|---|---|---|
| committer | Steve Bennetts <steve@lindenlab.com> | 2009-11-24 15:36:50 -0800 |
| commit | 5b5354c933aa7b1ceeb307853c24fba28d4e31bf (patch) | |
| tree | bb96ddc58400d8819921f0354279fac43192ac20 /indra | |
| parent | fb26dd779613ea088e44fd5d85044698cf782ede (diff) | |
| parent | de78ec1345648fb90c71fd8cc97a9134fc016803 (diff) | |
Merge
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llui/llconsole.cpp | 5 | ||||
| -rw-r--r-- | indra/newview/llappviewer.cpp | 7 |
2 files changed, 0 insertions, 12 deletions
diff --git a/indra/llui/llconsole.cpp b/indra/llui/llconsole.cpp index 48c76cf105..fa0abd55d0 100644 --- a/indra/llui/llconsole.cpp +++ b/indra/llui/llconsole.cpp @@ -392,9 +392,4 @@ void LLConsole::addLine(const LLWString& wline, F32 size, const LLColor4 &color) Paragraph paragraph(wline, color, mTimer.getElapsedTimeF32(), mFont, (F32)getRect().getWidth() ); mParagraphs.push_back ( paragraph ); - -#if LL_WINDOWS && LL_LCD_COMPILE - // add to LCD screen - AddNewDebugConsoleToLCD(wline); -#endif } diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index fa0ea557ba..edad76a072 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -799,13 +799,6 @@ bool LLAppViewer::init() // call all self-registered classes LLInitClassList::instance().fireCallbacks(); - #if LL_LCD_COMPILE - // start up an LCD window on a logitech keyboard, if there is one - HINSTANCE hInstance = GetModuleHandle(NULL); - gLcdScreen = new LLLCD(hInstance); - CreateLCDDebugWindows(); -#endif - LLFolderViewItem::initClass(); // SJB: Needs to happen after initWindow(), not sure why but related to fonts gGLManager.getGLInfo(gDebugInfo); |