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

Merge branch 'develop' of https://github.com/secondlife/viewer 

# Conflicts:
#	indra/newview/llviewertexturelist.cpp
master
Ansariel 2024-09-05 01:06:59 +02:00
parent 95707d7c13 49abe2c8bc
commit eda6b27185
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/llui/llcombobox.cpp
View File

@ -536,12 +536,16 @@ bool LLComboBox::setCurrentByIndex(S32 index)
if (item->getEnabled())
{
mList->selectItem(item, -1, true);
LLSD::String label = item->getColumn(0)->getValue().asString();
if (mTextEntry)
{
LLSD::String label = item->getColumn(0)->getValue().asString();
mTextEntry->setText(label);
mTextEntry->setTentative(false);
}
if (!mAllowTextEntry)
{
mButton->setLabel(label);
}
mLastSelectedIndex = index;
return true;
}

2
indra/newview/llfloaterimagepreview.cpp
View File

@ -1044,7 +1044,7 @@ void LLImagePreviewSculpted::setPreviewTarget(LLImageRaw* imagep, F32 distance)
}
// build indices
for (U16 i = 0; i < num_indices; i++)
for (U32 i = 0; i < num_indices; i++)
{
*(index_strider++) = vf.mIndices[i];
}

2
indra/newview/llviewerfloaterreg.cpp
View File

@ -299,7 +299,7 @@ public:
"avatar_picker",
"camera",
"camera_presets",
"change_item_thumbnail"
"change_item_thumbnail",
"classified",
"add_landmark",
"delete_pref_preset",

2
indra/newview/llviewertexture.cpp
View File

@ -556,7 +556,7 @@ void LLViewerTexture::updateClass()
if (sEvaluationTimer.getElapsedTimeF32() > MEMORY_CHECK_WAIT_TIME)
{
static LLCachedControl<F32> low_mem_min_discard_increment(gSavedSettings, "RenderLowMemMinDiscardIncrement", .1f);
sDesiredDiscardBias += (F32)low_mem_min_discard_increment * (F32)gFrameIntervalSeconds;
sDesiredDiscardBias += (F32) low_mem_min_discard_increment * (F32) gFrameIntervalSeconds;
sEvaluationTimer.reset();
}
}