From 67561663da789454c658b5d466e9518790ed9289 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Wed, 23 Mar 2011 14:55:28 -0400
Subject: STORM-1101 Using the -login parameter makes some keys and right click
 menus not work

---
 indra/newview/llstartup.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra')

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
-- 
cgit v1.2.3