diff options
| author | Tess Chu <tess@lindenlab.com> | 2007-11-20 02:53:43 +0000 |
|---|---|---|
| committer | Tess Chu <tess@lindenlab.com> | 2007-11-20 02:53:43 +0000 |
| commit | 2f6c7606241acdf800a2c079b359e7a1db360954 (patch) | |
| tree | adb6e6e34f9c3df1e2252b2f763ae20970c0e2d4 /indra/newview/llviewermenu.cpp | |
| parent | 813b140d0767146b17acf4ad2fb96fbd5a347c34 (diff) | |
svn merge -r 73926:74098 svn+ssh://svn/svn/linden/branches/viewer-auth-7
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
| -rw-r--r-- | indra/newview/llviewermenu.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index be595e616c..688b2889c8 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -235,6 +235,7 @@ extern BOOL gAllowSelectAvatar; LLMenuBarGL *gMenuBarView = NULL; LLViewerMenuHolderGL *gMenuHolder = NULL; LLMenuGL *gPopupMenuView = NULL; +LLMenuBarGL *gLoginMenuBarView = NULL; // Pie menus LLPieMenu *gPieSelf = NULL; @@ -750,6 +751,15 @@ 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) |