summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorJonathan Yap <none@none>2011-03-23 14:55:28 -0400
committerJonathan Yap <none@none>2011-03-23 14:55:28 -0400
commit67561663da789454c658b5d466e9518790ed9289 (patch)
treecc3a46137ebd5f99f0b9853e5d8f6ae6a7f82ab3 /indra
parent1c375a8c880354432da2b218c321ed708497e161 (diff)
STORM-1101 Using the -login parameter makes some keys and right click menus not work
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llstartup.cpp4
1 files changed, 2 insertions, 2 deletions
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