diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-04-18 16:25:02 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-04-18 16:25:02 -0400 |
| commit | 9c995e2a5ce45cc912605d077d704fa76ed904dd (patch) | |
| tree | 2f790ce33f92bff08ee64c45cfee4ad8ea62f4a5 /indra/newview/llstartup.cpp | |
| parent | 853231580aa2a6bf2894c20495c549a9d5f3c673 (diff) | |
| parent | 81676d4753a1abe347a69a95f234a005aad0659f (diff) | |
merge up from viewer-development (with changes for storm-160 backed out)
Diffstat (limited to 'indra/newview/llstartup.cpp')
| -rw-r--r-- | indra/newview/llstartup.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index ef075f9cbb..078de0cbdf 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -720,6 +720,8 @@ bool idle_startup() timeout_count = 0; + initialize_edit_menu(); + if (show_connect_box) { // Load all the name information out of the login view @@ -736,8 +738,6 @@ bool idle_startup() // Make sure the process dialog doesn't hide things gViewerWindow->setShowProgress(FALSE); - initialize_edit_menu(); - // Show the login dialog login_show(); // connect dialog is already shown, so fill in the names |