diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-08-05 15:19:42 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-05 15:19:42 +0300 |
| commit | 693c217da5aa6d405dd62c9bbed006074747983c (patch) | |
| tree | 44b2406c9b5e26b558caf415e69977baa8f6a112 /indra/newview/llviewermenu.cpp | |
| parent | 4a702182daf872e77797a1ff7e6e3040c3c5806d (diff) | |
| parent | f63a371f92c90e73fd6e0bc42d33b75500a7e1c0 (diff) | |
Merge pull request #2190 from RyeMutt/color-debug-floater
Introduce LLUIColorTable debug-settings-alike floater and fix various color system bugs
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
| -rw-r--r-- | indra/newview/llviewermenu.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 0c8dd6dff9..e3b92598f7 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -536,9 +536,7 @@ void init_menus() /// /// set up the colors /// - LLColor4 color; - - LLColor4 context_menu_color = LLUIColorTable::instance().getColor("MenuPopupBgColor"); + LLUIColor context_menu_color = LLUIColorTable::instance().getColor("MenuPopupBgColor"); gMenuAvatarSelf->setBackgroundColor( context_menu_color ); gMenuAvatarOther->setBackgroundColor( context_menu_color ); @@ -548,7 +546,7 @@ void init_menus() gMenuLand->setBackgroundColor( context_menu_color ); - color = LLUIColorTable::instance().getColor( "MenuPopupBgColor" ); + LLUIColor color = LLUIColorTable::instance().getColor( "MenuPopupBgColor" ); gPopupMenuView->setBackgroundColor( color ); // If we are not in production, use a different color to make it apparent. |