livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIRE-29819: Disable the show grid selection checkbox in prefs for OpenSim builds if necessary

meow-7.2.2
Ansariel 2020-11-26 20:44:03 +01:00
parent 9f3933d7e4
commit 0bccc9d518
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
indra/newview/llfloaterpreference.cpp
View File

@ -815,7 +815,7 @@ BOOL LLFloaterPreference::postBuild()
// [/SL:KB]
// <FS:AW opensim preferences>
#if !defined(OPENSIM) || defined(SINGLEGRID)// <FS:AW optional opensim support/>
#if !defined(OPENSIM) || defined(SINGLEGRID)
// Hide the opensim tab if opensim isn't enabled
LLTabContainer* tab_container = getChild<LLTabContainer>("pref core");
if (tab_container)
@ -824,9 +824,11 @@ BOOL LLFloaterPreference::postBuild()
if (opensim_panel)
tab_container->removeTabPanel(opensim_panel);
}
#endif
#if defined(OPENSIM) && !defined(SINGLEGRID)
childSetEnabled("show_grid_selection_check", !gSavedSettings.getBOOL("FSOpenSimAlwaysForceShowGrid"));
#endif
// </FS:AW opensim preferences>
#endif // OPENSIM // <FS:AW optional opensim support/>
// <FS:Zi> Pie menu
gSavedSettings.getControl("OverridePieColors")->getSignal()->connect(boost::bind(&LLFloaterPreference::onPieColorsOverrideChanged, this));