diff options
| author | Jonathan "Geenz" Goodman <geenz@lindenlab.com> | 2026-05-20 14:14:46 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-05-20 14:14:46 -0400 |
| commit | acde43cce9700f5c5a50b03b7d96c1db18734e7e (patch) | |
| tree | 885411015577dfaafa844fc8943d834c9d67bd7d /indra/newview/llviewermenu.cpp | |
| parent | df844170600608b37c2725f7a263f1de3b055618 (diff) | |
| parent | 7a40e2702f7d2a81e674f66f637261a09de5b9ca (diff) | |
Merge pull request #5844 from secondlife/geenz/26.3-to-develop
26.3 to Develop
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
| -rw-r--r-- | indra/newview/llviewermenu.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 129d5477f1..ff111dd1bc 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -127,7 +127,6 @@ #include "llviewerstatsrecorder.h" #include "llvlcomposition.h" #include "llvoavatarself.h" -#include "llvoicevivox.h" #include "llworld.h" #include "llworldmap.h" #include "pipeline.h" @@ -649,7 +648,7 @@ void init_menus() LLRect menuBarRect = gLoginMenuBarView->getRect(); menuBarRect.setLeftTopAndSize(0, menu_bar_holder->getRect().getHeight(), menuBarRect.getWidth(), menuBarRect.getHeight()); gLoginMenuBarView->setRect(menuBarRect); - gLoginMenuBarView->setBackgroundColor( color ); + gLoginMenuBarView->setBackgroundColor(LLColor4::black); menu_bar_holder->addChild(gLoginMenuBarView); // tooltips are on top of EVERYTHING, including menus |