diff options
| author | callum <none@none> | 2009-12-18 15:15:34 -0800 |
|---|---|---|
| committer | callum <none@none> | 2009-12-18 15:15:34 -0800 |
| commit | 01006749158de1c7c4da89ddad549025f376c6e0 (patch) | |
| tree | fca6888218079c4da17aa1b1d420d4bf231779c3 /indra/newview/llstartup.cpp | |
| parent | fb862f18159d320572008b6a8da81ffd2f109e37 (diff) | |
| parent | 4964ca39f14531630ffbfece593f8ba9cdc86e4e (diff) | |
Merge with tip
Diffstat (limited to 'indra/newview/llstartup.cpp')
| -rw-r--r-- | indra/newview/llstartup.cpp | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 539673ab9e..73e7d99815 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -1634,11 +1634,15 @@ bool idle_startup() gSavedSettings.setString("TutorialURL", tutorial_url.asString()); } - LLSD use_tutorial = (*it)["use_tutorial"]; - if(use_tutorial.asString() == "true") - { - show_hud = true; - } + // For Viewer 2.0 we are not using the web-based tutorial + // If we reverse that decision, put this code back and use + // login.cgi to send a different URL with content that matches + // the Viewer 2.0 UI. + //LLSD use_tutorial = (*it)["use_tutorial"]; + //if(use_tutorial.asString() == "true") + //{ + // show_hud = true; + //} } } // Either we want to show tutorial because this is the first login |