Fix win32 warnings
This commit is contained in:
@@ -736,7 +736,7 @@ void LLFavoritesBarCtrl::updateButtons()
|
||||
}
|
||||
const child_list_t* childs = getChildList();
|
||||
child_list_const_iter_t child_it = childs->begin();
|
||||
int first_changed_item_index = 0;
|
||||
size_t first_changed_item_index = 0;
|
||||
int rightest_point = getRect().mRight - mMoreTextBox->getRect().getWidth();
|
||||
//lets find first changed button
|
||||
while (child_it != childs->end() && first_changed_item_index < mItems.size())
|
||||
@@ -798,7 +798,7 @@ void LLFavoritesBarCtrl::updateButtons()
|
||||
}
|
||||
//last_right_edge is saving coordinates
|
||||
LLButton* last_new_button = NULL;
|
||||
int j = first_changed_item_index;
|
||||
size_t j = first_changed_item_index;
|
||||
for (; j < mItems.size(); j++)
|
||||
{
|
||||
last_new_button = createButton(mItems[j], button_params, last_right_edge);
|
||||
@@ -982,7 +982,7 @@ void LLFavoritesBarCtrl::updateMenuItems(LLMenuGL* menu)
|
||||
|
||||
U32 widest_item = 0;
|
||||
|
||||
for (S32 i = mFirstDropDownItem; i < mItems.size(); i++)
|
||||
for (size_t i = mFirstDropDownItem; i < mItems.size(); i++)
|
||||
{
|
||||
LLViewerInventoryItem* item = mItems.at(i);
|
||||
const std::string& item_name = item->getName();
|
||||
|
||||
@@ -101,8 +101,8 @@ protected:
|
||||
|
||||
LLUUID mFavoriteFolderId;
|
||||
const LLFontGL *mFont;
|
||||
S32 mFirstDropDownItem;
|
||||
S32 mDropDownItemsCount;
|
||||
size_t mFirstDropDownItem;
|
||||
U32 mDropDownItemsCount;
|
||||
bool mUpdateDropDownItems;
|
||||
bool mRestoreOverflowMenu;
|
||||
|
||||
|
||||
@@ -2021,7 +2021,7 @@ void LLModelPreview::loadModelCallback(S32 loaded_lod)
|
||||
}
|
||||
|
||||
//add current model to current LoD's model list (LLModel::mLocalID makes a good vector index)
|
||||
S32 idx = list_iter->mModel->mLocalID;
|
||||
size_t idx = list_iter->mModel->mLocalID;
|
||||
|
||||
if (mModel[lod].size() <= idx)
|
||||
{ //stretch model list to fit model at given index
|
||||
|
||||
@@ -263,14 +263,14 @@ void LLParticipantList::refreshSpeakers()
|
||||
mSpeakerMgr->update(resort_ok);
|
||||
|
||||
bool re_sort = false;
|
||||
int start_pos = llmax(0, scroll_pos - 20);
|
||||
int end_pos = scroll_pos + mAvatarList->getLinesPerPage() + 20;
|
||||
size_t start_pos = llmax(0, scroll_pos - 20);
|
||||
size_t end_pos = scroll_pos + mAvatarList->getLinesPerPage() + 20;
|
||||
std::vector<LLScrollListItem*> items = mAvatarList->getAllData();
|
||||
if (start_pos >= items.size())
|
||||
{
|
||||
return;
|
||||
}
|
||||
int count = 0;
|
||||
size_t count = 0;
|
||||
for (std::vector<LLScrollListItem*>::iterator item_it = items.begin(); item_it != items.end(); ++item_it)
|
||||
{
|
||||
|
||||
|
||||
@@ -439,7 +439,7 @@ bool LLScriptEdCore::loadScriptText(const std::string& filename)
|
||||
|
||||
// read in the whole file
|
||||
fseek(file, 0L, SEEK_END);
|
||||
long file_length = ftell(file);
|
||||
size_t file_length = ftell(file);
|
||||
fseek(file, 0L, SEEK_SET);
|
||||
if (file_length > 0)
|
||||
{
|
||||
|
||||
@@ -1808,11 +1808,11 @@ void LLVOAvatar::calculateSpatialExtents(LLVector4a& newMin, LLVector4a& newMax)
|
||||
for (polymesh_map_t::iterator i = mPolyMeshes.begin(); i != mPolyMeshes.end(); ++i)
|
||||
{
|
||||
LLPolyMesh* mesh = i->second;
|
||||
for (S32 joint_num = 0; joint_num < mesh->mJointRenderData.size(); joint_num++)
|
||||
for (const auto& joint : mesh->mJointRenderData)
|
||||
{
|
||||
static const LLVector4Logical mask = _mm_load_ps((F32*)&S_V4LOGICAL_MASK_TABLE[3 * 4]);
|
||||
LLVector4a trans;
|
||||
trans.setSelectWithMask(mask, _mm_setzero_ps(), mesh->mJointRenderData[joint_num]->mWorldMatrix->getRow<3>());
|
||||
trans.setSelectWithMask(mask, _mm_setzero_ps(), joint->mWorldMatrix->getRow<3>());
|
||||
update_min_max(newMin, newMax, trans);
|
||||
}
|
||||
}
|
||||
@@ -8778,7 +8778,7 @@ void LLVOAvatar::updateMeshVisibility()
|
||||
|
||||
//LL_INFOS() << "head " << bake_flag[BAKED_HEAD] << "eyes " << bake_flag[BAKED_EYES] << "hair " << bake_flag[BAKED_HAIR] << "lower " << bake_flag[BAKED_LOWER] << "upper " << bake_flag[BAKED_UPPER] << "skirt " << bake_flag[BAKED_SKIRT] << LL_ENDL;
|
||||
|
||||
for (S32 i = 0; i < mMeshLOD.size(); i++)
|
||||
for (size_t i = 0; i < mMeshLOD.size(); i++)
|
||||
{
|
||||
LLAvatarJoint* joint = mMeshLOD[i];
|
||||
if (i == MESH_ID_HAIR)
|
||||
@@ -9471,7 +9471,7 @@ void LLVOAvatar::dumpAppearanceMsgParams( const std::string& dump_prefix,
|
||||
|
||||
apr_file_printf(file, "\n<params>\n");
|
||||
LLVisualParam* param = getFirstVisualParam();
|
||||
for (S32 i = 0; i < params_for_dump.size(); i++)
|
||||
for (const auto& param_for_dump : params_for_dump)
|
||||
{
|
||||
while( param && ((param->getGroup() != VISUAL_PARAM_GROUP_TWEAKABLE) &&
|
||||
(param->getGroup() != VISUAL_PARAM_GROUP_TRANSMIT_NOT_TWEAKABLE)) ) // should not be any of group VISUAL_PARAM_GROUP_TWEAKABLE_NO_TRANSMIT
|
||||
@@ -9479,7 +9479,7 @@ void LLVOAvatar::dumpAppearanceMsgParams( const std::string& dump_prefix,
|
||||
param = getNextVisualParam();
|
||||
}
|
||||
LLViewerVisualParam* viewer_param = (LLViewerVisualParam*)param;
|
||||
F32 value = params_for_dump[i];
|
||||
F32 value = param_for_dump;
|
||||
dump_visual_param(file, viewer_param, value);
|
||||
param = getNextVisualParam();
|
||||
}
|
||||
@@ -10187,9 +10187,8 @@ void LLVOAvatar::getSortedJointNames(S32 joint_type, std::vector<std::string>& r
|
||||
}
|
||||
else if (joint_type==1)
|
||||
{
|
||||
for (S32 i = 0; i < mCollisionVolumes.size(); i++)
|
||||
for (const auto& pJoint : mCollisionVolumes)
|
||||
{
|
||||
LLAvatarJointCollisionVolume* pJoint = mCollisionVolumes[i];
|
||||
result.push_back(pJoint->getName());
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user