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

DRTVWR-600 macos buildfix

master
Andrey Lihatskiy 2023-12-15 09:03:52 +02:00
parent 7f9438ed2b
commit 3954e5d802
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llkdu/llimagej2ckdu.cpp
View File

@ -579,7 +579,7 @@ bool LLImageJ2CKDU::decodeImpl(LLImageJ2C &base, LLImageRaw &raw_image, F32 deco
mCodeStreamp.get()));
}
// Do the actual processing
F32 remaining_time = limit_time ? decode_time - decode_timer.getElapsedTimeF32() : 0.0f;
F32 remaining_time = limit_time ? static_cast<F32>(decode_time - decode_timer.getElapsedTimeF32()) : 0.0f;
// This is where we do the actual decode. If we run out of time, return false.
if (mDecodeState->processTileDecode(remaining_time, limit_time))
{

2
indra/newview/llinventorygallerymenu.cpp
View File

@ -70,7 +70,7 @@ void modify_outfit(BOOL append, const LLUUID& cat_id, LLInventoryModel* model)
if (items.size() > max_items())
{
LLSD args;
args["AMOUNT"] = llformat("%d", max_items);
args["AMOUNT"] = llformat("%d", static_cast<U32>(max_items));
LLNotificationsUtil::add("TooManyWearables", args);
return;
}