summaryrefslogtreecommitdiff
path: root/indra/newview/llstartup.cpp
diff options
context:
space:
mode:
authorVadim Savchuk <vsavchuk@productengine.com>2010-06-03 19:07:23 +0300
committerVadim Savchuk <vsavchuk@productengine.com>2010-06-03 19:07:23 +0300
commitcdab7667320164666682cf46b79faf9d8c5e037b (patch)
tree5e377cb7077f82a32cb7913b1cc1580b4b39befd /indra/newview/llstartup.cpp
parent2af1fd0c62b06869253d7d68599365973821bab3 (diff)
parent797c1dbc6ef1c51755dcace98caf0c493cd8f511 (diff)
Merge from default branch
--HG-- branch : product-engine
Diffstat (limited to 'indra/newview/llstartup.cpp')
-rw-r--r--indra/newview/llstartup.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 6418551517..e51e6363dd 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -736,6 +736,8 @@ 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