diff options
| author | McCabe Maxsted | 2010-06-03 06:55:37 -0700 |
|---|---|---|
| committer | Jacek Antonelli | 2010-06-19 02:43:29 -0500 |
| commit | a17a3f1feb134bbbf0091f19ac7a93ac89815956 (patch) | |
| tree | a424e63b50521bdc92c81cefe7330b5eeca45c3d /linden/indra/newview/llviewerwindow.cpp | |
| parent | Fix for the disappearing menu bar bug (#311) (diff) | |
| download | meta-impy-a17a3f1feb134bbbf0091f19ac7a93ac89815956.zip meta-impy-a17a3f1feb134bbbf0091f19ac7a93ac89815956.tar.gz meta-impy-a17a3f1feb134bbbf0091f19ac7a93ac89815956.tar.bz2 meta-impy-a17a3f1feb134bbbf0091f19ac7a93ac89815956.tar.xz | |
Make sure we only create menus once per session
Diffstat (limited to '')
| -rw-r--r-- | linden/indra/newview/llviewerwindow.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/linden/indra/newview/llviewerwindow.cpp b/linden/indra/newview/llviewerwindow.cpp index 047f198..4ef01f3 100644 --- a/linden/indra/newview/llviewerwindow.cpp +++ b/linden/indra/newview/llviewerwindow.cpp | |||
| @@ -1687,7 +1687,13 @@ void LLViewerWindow::initWorldUI() | |||
| 1687 | // | 1687 | // |
| 1688 | 1688 | ||
| 1689 | // Toolbox floater | 1689 | // Toolbox floater |
| 1690 | init_menus(); | 1690 | |
| 1691 | // Make sure we only create menus once per session -- MC | ||
| 1692 | if (!gMenuHolder) | ||
| 1693 | { | ||
| 1694 | init_menus(); | ||
| 1695 | } | ||
| 1696 | |||
| 1691 | if (!gFloaterTools) | 1697 | if (!gFloaterTools) |
| 1692 | { | 1698 | { |
| 1693 | gFloaterTools = new LLFloaterTools(); | 1699 | gFloaterTools = new LLFloaterTools(); |