diff --git a/indra/newview/llfloaterblacklist.cpp b/indra/newview/llfloaterblacklist.cpp index dde1e07c1..255552928 100644 --- a/indra/newview/llfloaterblacklist.cpp +++ b/indra/newview/llfloaterblacklist.cpp @@ -208,7 +208,7 @@ void LLFloaterBlacklist::onClickRemove(void* user_data) if(list->getFirstSelected()) { uuid_vec_t selectedIDs = list->getSelectedIDs(); - typename uuid_vec_t::const_iterator iterator; + uuid_vec_t::const_iterator iterator; for(iterator = selectedIDs.begin(); iterator != selectedIDs.end(); ++iterator) diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 8fc8f56b9..3fa013a73 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -2197,7 +2197,7 @@ int get_folder_levels(LLInventoryCategory* inv_cat) int max_child_levels = 0; - for (S32 i=0; i < cats->size(); ++i) + for (size_t i=0; i < cats->size(); ++i) { LLInventoryCategory* category = cats->at(i); max_child_levels = llmax(max_child_levels, get_folder_levels(category)); @@ -2447,7 +2447,7 @@ BOOL LLFolderBridge::dragCategoryIntoFolder(LLInventoryCategory* inv_cat, if (is_movable == TRUE) { - for (S32 i=0; i < descendent_items.size(); ++i) + for (size_t i=0; i < descendent_items.size(); ++i) { LLInventoryItem* item = descendent_items[i]; if (!can_move_to_outbox(item)) diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index ae2d31217..970bbcae9 100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -3951,7 +3951,7 @@ void LLRiggedVolume::update(const LLMeshSkinInfo* skin, LLVOAvatar* avatar, cons LLMatrix4a src; // clamp k to kMaxJoints to avoid reading garbage off stack in release - src.setMul(mp[(idx[k] < count) ? idx[k] : 0], w); + src.setMul(mp[(idx[k] < (S32)count) ? idx[k] : 0], w); final_mat.add(src); }