diff options
| author | Adam Moss <moss@lindenlab.com> | 2009-09-30 17:46:31 +0000 |
|---|---|---|
| committer | Adam Moss <moss@lindenlab.com> | 2009-09-30 17:46:31 +0000 |
| commit | feabeb496518f28359f654fdc397354355743589 (patch) | |
| tree | 99fa7dd202caac786d7032a2c8bd187a1f5a5ad0 /indra/newview/llappviewer.cpp | |
| parent | a3ba111e39be0bfa0278dfce66f4608fac7c0aa2 (diff) | |
DEV-35039 Viewer 2.0 Help System - Viewer Development
svn merge -r134800:134805 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer2help-3
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 355660faa5..30e0a5770c 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -67,6 +67,7 @@ #include "llviewerobjectlist.h" #include "llworldmap.h" #include "llmutelist.h" +#include "llviewerhelp.h" #include "lluicolortable.h" #include "llurldispatcher.h" #include "llurlhistory.h" @@ -663,8 +664,6 @@ bool LLAppViewer::init() mNumSessions++; gSavedSettings.setS32("NumSessions", mNumSessions); - gSavedSettings.setString("HelpLastVisitedURL",gSavedSettings.getString("HelpHomeURL")); - if (gSavedSettings.getBOOL("VerboseLogs")) { LLError::setPrintLocation(true); @@ -694,6 +693,9 @@ bool LLAppViewer::init() LLUrlAction::setOpenURLExternalCallback(&LLWeb::loadURLExternal); LLUrlAction::setExecuteSLURLCallback(&LLURLDispatcher::dispatchFromTextEditor); + // Let code in llui access the viewer help floater + LLUI::sHelpImpl = LLViewerHelp::getInstance(); + // Set the link color for any Urls in text fields LLTextBase::setLinkColor( LLUIColorTable::instance().getColor("HTMLLinkColor") ); |