summaryrefslogtreecommitdiff
path: root/indra/newview/llstartup.cpp
diff options
context:
space:
mode:
authorYuri Chebotarev <ychebotarev@productengine.com>2010-06-04 13:58:18 +0300
committerYuri Chebotarev <ychebotarev@productengine.com>2010-06-04 13:58:18 +0300
commit15711b29afd293acd23d948a51ea65795335c95f (patch)
tree8fdbb8e7275ed5d16a19d8bc3434b69d687b0b61 /indra/newview/llstartup.cpp
parent9345f01d4b61f857ed540cf725c8cd0ee1b0ef24 (diff)
parente1189d0e2ee47539edc68c3532e0a5ce64d5dcd1 (diff)
merge
--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