summaryrefslogtreecommitdiff
path: root/indra/newview/llstartup.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-06-03 15:59:44 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-06-03 15:59:44 +0100
commite697ca28acb91a422a7d46249f28a1b284217a61 (patch)
tree8f3e590d98b811707c8721825a1765eaf0a662ab /indra/newview/llstartup.cpp
parent2f526db82608915a6ed9d04f31fb004acf239f4f (diff)
parent797c1dbc6ef1c51755dcace98caf0c493cd8f511 (diff)
merge from viewer-public
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