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

Merge branch 'DRTVWR-539' of https://github.com/secondlife/viewer 

# Conflicts:
#	indra/newview/llfloaterpreference.h
#	indra/newview/llstartup.cpp
#	indra/newview/llvovolume.cpp
master
Ansariel 2023-03-07 14:57:47 +01:00
parent f2236ddf34 7298a049a7
commit adde408b18
7 changed files with 41 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/contributions.txt
View File

@ -288,6 +288,7 @@ Beq Janus
SL-18586
SL-18592
SL-18637
SL-19317
Beth Walcher
Bezilon Kasei
Biancaluce Robbiani

1
indra/edit-me-to-trigger-new-build.txt
View File

@ -1,2 +1 @@

17
indra/newview/llfloaterpreference.cpp
View File

@ -506,6 +506,7 @@ LLFloaterPreference::LLFloaterPreference(const LLSD& key)
gSavedSettings.getControl("UseDisplayNames")->getCommitSignal()->connect(boost::bind(&handleDisplayNamesOptionChanged, _2));
gSavedSettings.getControl("AppearanceCameraMovement")->getCommitSignal()->connect(boost::bind(&handleAppearanceCameraMovementChanged, _2));
gSavedSettings.getControl("WindLightUseAtmosShaders")->getCommitSignal()->connect(boost::bind(&LLFloaterPreference::onAtmosShaderChange, this));
LLAvatarPropertiesProcessor::getInstance()->addObserver( gAgent.getID(), this );
@ -3098,6 +3099,22 @@ void LLFloaterPreference::onClickActionChange()
updateClickActionControls();
}
void LLFloaterPreference::onAtmosShaderChange()
{
LLCheckBoxCtrl* ctrl_alm = getChild<LLCheckBoxCtrl>("UseLightShaders");
if(ctrl_alm)
{
//Deferred/SSAO/Shadows
BOOL bumpshiny = gGLManager.mHasCubeMap && LLCubeMap::sUseCubeMaps && LLFeatureManager::getInstance()->isFeatureAvailable("RenderObjectBump") && gSavedSettings.getBOOL("RenderObjectBump");
BOOL shaders = gSavedSettings.getBOOL("WindLightUseAtmosShaders");
BOOL enabled = LLFeatureManager::getInstance()->isFeatureAvailable("RenderDeferred") &&
bumpshiny &&
shaders;
ctrl_alm->setEnabled(enabled);
}
}
void LLFloaterPreference::onClickPermsDefault()
{
LLFloaterReg::showInstance("perms_default");

2
indra/newview/llfloaterpreference.h
View File

@ -158,6 +158,8 @@ protected:
// updates click/double-click action keybindngs depending on view values
void updateClickActionControls();
void onAtmosShaderChange();
// <FS:PP> updates UI Sounds controls depending on values from settings.xml
void updateUISoundsControls();

8
indra/newview/llstartup.cpp
View File

@ -3087,14 +3087,6 @@ bool idle_startup()
if (STATE_CLEANUP == LLStartUp::getStartupState())
{
// <FS:Ansariel> Disable this in favor of FS performance floater customization
//if (gAgent.isFirstLogin())
//{
// gSavedSettings.setBOOL("AutoTuneLock", TRUE);
// gSavedSettings.setBOOL("KeepAutoTuneLock", TRUE);
// gSavedSettings.setBOOL("AutoTuneFPS", TRUE);
//}
// </FS:Ansariel>
set_startup_status(1.0, "", "");
display_startup();

20
indra/newview/lltoolbarview.cpp
View File

@ -44,6 +44,7 @@
#include "llagent.h" // HACK for destinations guide on startup
#include "llfloaterreg.h" // HACK for destinations guide on startup
#include "llviewercontrol.h" // HACK for destinations guide on startup
#include "llinventorymodel.h" // HACK to disable starter avatars button for NUX
#include <boost/foreach.hpp>
@ -382,6 +383,25 @@ bool LLToolBarView::loadToolbars(bool force_default)
}
}
}
// SL-18581: Don't show the starter avatar toolbar button for NUX users
LLViewerInventoryCategory* my_outfits_cat = gInventory.getCategory(gInventory.findCategoryUUIDForType(LLFolderType::FT_MY_OUTFITS));
if (gAgent.isFirstLogin())
{
LL_WARNS() << "First login: checking for NUX user." << LL_ENDL;
if (my_outfits_cat != NULL && my_outfits_cat->getDescendentCount() > 0)
{
LL_WARNS() << "First login: My Outfits folder is not empty, removing the avatar picker button." << LL_ENDL;
for (S32 i = LLToolBarEnums::TOOLBAR_FIRST; i <= LLToolBarEnums::TOOLBAR_LAST; i++)
{
if (mToolbars[i])
{
mToolbars[i]->removeCommand(LLCommandId("avatar"));
}
}
}
}
mToolbarsLoaded = true;
return true;
}

2
indra/newview/llvovolume.cpp
View File

@ -5727,7 +5727,7 @@ void LLVolumeGeometryManager::registerFace(LLSpatialGroup* group, LLFace* facep,
}
}
// if (type == LLRenderPass::PASS_ALPHA) // <FS:Beq/> always populate the draw_info ptr
// if (type == LLRenderPass::PASS_ALPHA) // always populate the draw_info ptr
{ //for alpha sorting
facep->setDrawInfo(draw_info);
}