summaryrefslogtreecommitdiff
path: root/indra/newview/llstartup.cpp
diff options
context:
space:
mode:
authorRichard Linden <none@none>2010-06-02 15:33:37 -0700
committerRichard Linden <none@none>2010-06-02 15:33:37 -0700
commit6d69f054785ea16c2c1cb6c091328140f2504089 (patch)
tree5c0b7eb13d337aa223175468a926aa9e64594476 /indra/newview/llstartup.cpp
parent1e13fd9260696e10df05dcb81803649c805b95cd (diff)
parenta541c1d53ed2e7bce713b742684d5e16320d8100 (diff)
merge
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