diff options
author | Jonathan Yap <none@none> | 2011-03-23 14:55:28 -0400 |
---|---|---|
committer | Jonathan Yap <none@none> | 2011-03-23 14:55:28 -0400 |
commit | 67561663da789454c658b5d466e9518790ed9289 (patch) | |
tree | cc3a46137ebd5f99f0b9853e5d8f6ae6a7f82ab3 | |
parent | 1c375a8c880354432da2b218c321ed708497e161 (diff) |
STORM-1101 Using the -login parameter makes some keys and right click menus not work
-rw-r--r-- | doc/contributions.txt | 3 | ||||
-rw-r--r-- | indra/newview/llstartup.cpp | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 560bedd518..35882d1fb2 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -156,6 +156,8 @@ Angus Boyd VWR-592 Ann Congrejo CT-193 +Ansariel Hiller + STORM-1101 Ardy Lay VWR-19499 VWR-24917 @@ -413,6 +415,7 @@ Jonathan Yap STORM-990 STORM-1020 STORM-1064 + STORM-1101 Kage Pixel VWR-11 Ken March diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 8fccb35886..417bac7df0 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -722,6 +722,8 @@ bool idle_startup() timeout_count = 0; + initialize_edit_menu(); + if (show_connect_box) { // Load all the name information out of the login view @@ -738,8 +740,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 |