merge changes for storm-1101

doc/contributions.txt

@@ -155,6 +155,8 @@ Angus Boyd
 	VWR-592
 Ann Congrejo
 	CT-193
+Ansariel Hiller
+	STORM-1101
 Ardy Lay
 	VWR-19499
 	VWR-24917
@@ -417,6 +419,7 @@ Jonathan Yap
 	STORM-1020
 	STORM-1064
 	STORM-960
+	STORM-1101
 	STORM-1108
 	STORM-1094
 	STORM-1077

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