diff options
| -rw-r--r-- | indra/llkdu/llimagej2ckdu.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llinventorygallerymenu.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/llkdu/llimagej2ckdu.cpp b/indra/llkdu/llimagej2ckdu.cpp index eeda08f21e..d96cd105dd 100644 --- a/indra/llkdu/llimagej2ckdu.cpp +++ b/indra/llkdu/llimagej2ckdu.cpp @@ -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)) { diff --git a/indra/newview/llinventorygallerymenu.cpp b/indra/newview/llinventorygallerymenu.cpp index f653641bb2..c8ac73b838 100644 --- a/indra/newview/llinventorygallerymenu.cpp +++ b/indra/newview/llinventorygallerymenu.cpp @@ -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; } |