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

Fix merge issues

master
Ansariel 2024-03-27 14:44:22 +01:00 committed by Andrey Lihatskiy
parent 71ed19839e
commit 32c24ffbd7
4 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
autobuild.xml
View File

@ -1572,6 +1572,18 @@
<key>name</key>
<string>linux64</string>
</map>
<key>windows</key>
<map>
<key>archive</key>
<map>
<key>hash</key>
<string>2e5f1f7046a49d8b0bc295aa878116bc</string>
<key>url</key>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/60043/564063/llphysicsextensions_stub-1.0.542456-windows-542456.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
</map>
</map>
<key>license</key>
<string>internal</string>

2
indra/newview/lltexturectrl.cpp
View File

@ -1530,7 +1530,7 @@ void LLFloaterTexturePicker::setInventoryPickType(EPickInventoryType type)
// refresh selection
if (!mImageAssetID.isNull() || mInventoryPickType == PICK_MATERIAL)
{
mInventoryPanel->setSelection(findItemID(mImageAssetID, FALSE), TAKE_FOCUS_NO);
mInventoryPanel->setSelection(findItemID(mImageAssetID, false), TAKE_FOCUS_NO);
}
}

2
indra/newview/lltooldraganddrop.cpp
View File

@ -1159,7 +1159,7 @@ void LLToolDragAndDrop::dropTextureAllFaces(LLViewerObject* hit_obj,
if (has_non_pbr_faces || remove_pbr)
{
BOOL res = handleDropMaterialProtections(hit_obj, item, source, src_id);
bool res = handleDropMaterialProtections(hit_obj, item, source, src_id);
if (!res)
{
return;

2
indra/newview/llviewerdisplay.cpp
View File

@ -730,8 +730,8 @@ void display(bool rebuild, F32 zoom_factor, int subfield, bool for_snapshot)
LL_PROFILE_ZONE_NAMED_CATEGORY_DISPLAY("display - 2")
if (gResizeScreenTexture)
{
gResizeScreenTexture = false;
gPipeline.resizeScreenTexture();
gResizeScreenTexture = false;
}
gGL.setColorMask(true, true);