diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-07-24 13:11:14 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-07-24 13:11:14 -0400 |
| commit | ef37311e9e47c26b370a61bb61361ed60f8d878a (patch) | |
| tree | ea4cb7c83d7ea5e0b328ea3595fd87942bd17c89 /indra/newview/llstartup.cpp | |
| parent | 42cc602732824df9af239de3b5d7ba05b5797106 (diff) | |
| parent | 8df36196215131cbac961f47bfbd4a1b925548cb (diff) | |
merge up to latest viewer-pathfinding (including 3.3.4)
Diffstat (limited to 'indra/newview/llstartup.cpp')
| -rw-r--r-- | indra/newview/llstartup.cpp | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 417419d13c..a28d8d3546 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -741,6 +741,7 @@ bool idle_startup() { display_startup(); initialize_edit_menu(); + initialize_spellcheck_menu(); display_startup(); init_menus(); display_startup(); @@ -3208,17 +3209,6 @@ bool process_login_success_response() gSavedSettings.setU32("PreferredMaturity", preferredMaturity); } - // During the AO transition, this flag will be true. Then the flag will - // go away. After the AO transition, this code and all the code that - // uses it can be deleted. - text = response["ao_transition"].asString(); - if (!text.empty()) - { - if (text == "1") - { - gAgent.setAOTransition(); - } - } text = response["start_location"].asString(); if(!text.empty()) |