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

Merge pull request #2105 from RyeMutt/button-image-warning 

Fix warning from misnamed button image name reference
master
Andrey Lihatskiy 2024-07-25 11:38:01 +03:00 committed by GitHub
parent 2fa69bc13e 4b543b618b
commit 3330a4adb8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 28 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
indra/newview/llhudtext.cpp
View File

@ -392,7 +392,8 @@ void LLHUDText::updateVisibility()
LLVector3 pos_agent_center = gAgent.getPosAgentFromGlobal(mPositionGlobal) - dir_from_camera;
F32 last_distance_center = (pos_agent_center - LLViewerCamera::getInstance()->getOrigin()).magVec();
F32 max_draw_distance = gSavedSettings.getF32("PrimTextMaxDrawDistance");
static LLCachedControl<bool> prim_text_max_dist(gSavedSettings, "PrimTextMaxDrawDistance");
F32 max_draw_distance = prim_text_max_dist;
if(max_draw_distance < 0)
{

3
indra/newview/llmeshrepository.cpp
View File

@ -3743,7 +3743,8 @@ void LLMeshRepository::notifyLoadedMeshes()
? (2 * LLAppCoreHttp::PIPELINING_DEPTH)
: 5);
LLMeshRepoThread::sMaxConcurrentRequests = gSavedSettings.getU32("Mesh2MaxConcurrentRequests");
static LLCachedControl<U32> mesh2_max_req(gSavedSettings, "Mesh2MaxConcurrentRequests");
LLMeshRepoThread::sMaxConcurrentRequests = mesh2_max_req;
LLMeshRepoThread::sRequestHighWater = llclamp(scale * S32(LLMeshRepoThread::sMaxConcurrentRequests),
REQUEST2_HIGH_WATER_MIN,
REQUEST2_HIGH_WATER_MAX);

3
indra/newview/lloutfitgallery.cpp
View File

@ -416,7 +416,8 @@ void LLOutfitGallery::updateRowsIfNeeded()
bool compareGalleryItem(LLOutfitGalleryItem* item1, LLOutfitGalleryItem* item2)
{
if(gSavedSettings.getBOOL("OutfitGallerySortByName") ||
static LLCachedControl<bool> outfit_gallery_sort_by_name(gSavedSettings, "OutfitGallerySortByName");
if(outfit_gallery_sort_by_name ||
((item1->isDefaultImage() && item2->isDefaultImage()) || (!item1->isDefaultImage() && !item2->isDefaultImage())))
{
std::string name1 = item1->getItemName();

33
indra/newview/llphysicsmotion.cpp
View File

@ -454,25 +454,26 @@ F32 LLPhysicsMotion::calculateAcceleration_local(const F32 velocity_local, const
bool LLPhysicsMotionController::onUpdate(F32 time, U8* joint_mask)
{
LL_PROFILE_ZONE_SCOPED_CATEGORY_AVATAR;
// Skip if disabled globally.
if (!gSavedSettings.getBOOL("AvatarPhysics"))
{
return true;
}
// Skip if disabled globally.
static LLCachedControl<bool> av_physics(gSavedSettings, "AvatarPhysics");
if (!av_physics)
{
return true;
}
bool update_visuals = false;
for (motion_vec_t::iterator iter = mMotions.begin();
iter != mMotions.end();
++iter)
{
LLPhysicsMotion *motion = (*iter);
update_visuals |= motion->onUpdate(time);
}
bool update_visuals = false;
for (motion_vec_t::iterator iter = mMotions.begin();
iter != mMotions.end();
++iter)
{
LLPhysicsMotion *motion = (*iter);
update_visuals |= motion->onUpdate(time);
}
if (update_visuals)
mCharacter->updateVisualParams();
if (update_visuals)
mCharacter->updateVisualParams();
return true;
return true;
}
// Return true if character has to update visual params.

3
indra/newview/lltoolpie.cpp
View File

@ -1424,7 +1424,8 @@ void LLToolPie::handleDeselect()
LLTool* LLToolPie::getOverrideTool(MASK mask)
{
if (gSavedSettings.getBOOL("EnableGrab"))
static LLCachedControl<bool> enable_grab(gSavedSettings, "EnableGrab");
if (enable_grab)
{
if (mask == DEFAULT_GRAB_MASK)
{

4
indra/newview/skins/default/xui/en/panel_scrolling_param.xml
View File

@ -84,7 +84,7 @@
enabled="false"
height="132"
image_disabled="PushButton_Disabled"
image_disabled_selected="PushButton_Disabled_Selected"
image_disabled_selected="PushButton_Selected_Disabled"
image_selected="PushButton_Selected"
image_unselected="PushButton_Off"
layout="topleft"
@ -97,7 +97,7 @@
enabled="false"
height="132"
image_disabled="PushButton_Disabled"
image_disabled_selected="PushButton_Disabled_Selected"
image_disabled_selected="PushButton_Selected_Disabled"
image_selected="PushButton_Selected"
image_unselected="PushButton_Off"
layout="topleft"

2
indra/newview/skins/default/xui/en/widgets/drop_down.xml
View File

@ -12,7 +12,7 @@
image_unselected="PushButton_Off"
image_selected="PushButton_Selected"
image_disabled="PushButton_Disabled"
image_disabled_selected="PushButton_Disabled_Selected"
image_disabled_selected="PushButton_Selected_Disabled"
image_overlay="Combobox_Over"
image_overlay_alignment="right" />
<drop_down.combo_list bg_writeable_color="white" />