Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compiler fixies

Browse Source
This commit is contained in:
Inusaito Sayori
2015-09-28 18:59:44 -04:00
parent 79a179f569
commit ed701f9c88
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llfloaterblacklist.cpp
View File

@@ -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)

4
indra/newview/llinventorybridge.cpp
View File

@@ -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))

2
indra/newview/llvovolume.cpp
View File

@@ -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);
}