diff options
| author | Tess Chu <tess@lindenlab.com> | 2007-11-15 22:39:12 +0000 |
|---|---|---|
| committer | Tess Chu <tess@lindenlab.com> | 2007-11-15 22:39:12 +0000 |
| commit | 813b140d0767146b17acf4ad2fb96fbd5a347c34 (patch) | |
| tree | d47a36708813b3f93b4049d822f966c48de4e576 /indra/newview/llviewermenu.cpp | |
| parent | 291d99bc66c4c2b8009ba723a43e2e97d24313f9 (diff) | |
svn merge -r73880:73879 svn+ssh://svn/svn/linden/release. backing out viewer auth merge
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
| -rw-r--r-- | indra/newview/llviewermenu.cpp | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 688b2889c8..be595e616c 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -235,7 +235,6 @@ extern BOOL gAllowSelectAvatar; LLMenuBarGL *gMenuBarView = NULL; LLViewerMenuHolderGL *gMenuHolder = NULL; LLMenuGL *gPopupMenuView = NULL; -LLMenuBarGL *gLoginMenuBarView = NULL; // Pie menus LLPieMenu *gPieSelf = NULL; @@ -751,15 +750,6 @@ void init_menus() // Debug menu visiblity // show_debug_menus(); - - gLoginMenuBarView = (LLMenuBarGL*)gUICtrlFactory->buildMenu("menu_login.xml", gMenuHolder); - LLRect menuBarRect = gLoginMenuBarView->getRect(); - gLoginMenuBarView->setRect(LLRect(menuBarRect.mLeft, menuBarRect.mTop, gViewerWindow->getRootView()->getRect().getWidth() - menuBarRect.mLeft, menuBarRect.mBottom)); - - gLoginMenuBarView->setBackgroundColor( color ); - - gMenuHolder->addChild(gLoginMenuBarView); - } void init_landmark_menu(LLMenuGL* menu) |