diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-04-12 20:35:33 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-04-12 20:35:33 -0400 |
| commit | c857064af23292dfc4609fec6d22927ba8bd9dba (patch) | |
| tree | 4c21a2cf47a4526674b23ff498e816fca1a8816b | |
| parent | fa1827fa32f5dc046b17cde1ddbac8316f061793 (diff) | |
| parent | 67561663da789454c658b5d466e9518790ed9289 (diff) | |
merge changes for storm-1101
| -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 ff982ec61a..7a662ef8fa 100644 --- a/doc/contributions.txt +++ b/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 diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 4bc8a7ec54..ca908ef822 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 |