Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Combine commonly created scroll list menus into single menus identified by menu_num instead of their menu_file

Browse Source 
sScrollListMenus is an array such that it will hold more menus in the future, such as groups.
fmenu_file still exists and will still exhibit its old behavior if used.
This commit is contained in:
Inusaito Sayori
2014-01-24 21:41:56 -05:00
parent aaf06fa2cc
commit 2450b435a7
12 changed files with 29 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
indra/newview/llviewermenu.cpp
View File

@@ -239,6 +239,7 @@ extern BOOL gDebugTextEditorTips;
extern BOOL gShowOverlayTitle;
extern BOOL gOcclusionCull;
extern AIHTTPView* gHttpView;
extern LLMenuGL* sScrollListMenus[1];
//
// Globals
//
@@ -781,6 +782,10 @@ void init_menus()
gMenuHolder->addChild(gLoginMenuBarView);
// Singu Note: Initialize common ScrollListMenus here
sScrollListMenus[0] = LLUICtrlFactory::getInstance()->buildMenu("menu_avs_list.xml", gMenuHolder);
//sScrollListMenus[1] = LLUICtrlFactory::getInstance()->buildMenu("menu_groups_list.xml"); // Singu TODO
LLView* ins = gMenuBarView->getChildView("insert_world", true, false);
ins->setVisible(false);
ins = gMenuBarView->getChildView("insert_agent", true, false);