summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorAnchor <none@none>2019-06-10 15:56:44 -0700
committerNat Goodspeed <nat@lindenlab.com>2020-03-25 18:44:04 -0400
commit32f1dfa531062071ccf090b9c3d391b274caf02b (patch)
tree8672316c478943e66a76b0a7274bb8875d53459d /indra/newview
parenta9191a83d9865c129cc483c33a8a338dc00f5cc9 (diff)
[DRTVWR-476] - fix compiler errors 32 bit windows build
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llpaneleditwearable.cpp6
-rw-r--r--indra/newview/llvovolume.cpp2
2 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llpaneleditwearable.cpp b/indra/newview/llpaneleditwearable.cpp
index 6573be0aaf..c601a6c210 100644
--- a/indra/newview/llpaneleditwearable.cpp
+++ b/indra/newview/llpaneleditwearable.cpp
@@ -778,7 +778,7 @@ BOOL LLPanelEditWearable::postBuild()
LL_WARNS() << "could not get wearable dictionary entry for wearable of type: " << type << LL_ENDL;
continue;
}
- U8 num_subparts = wearable_entry->mSubparts.size();
+ U8 num_subparts = (U8)(wearable_entry->mSubparts.size());
for (U8 index = 0; index < num_subparts; ++index)
{
@@ -1181,7 +1181,7 @@ void LLPanelEditWearable::showWearable(LLViewerWearable* wearable, BOOL show, BO
updatePanelPickerControls(type);
// clear and rebuild visual param list
- U8 num_subparts = wearable_entry->mSubparts.size();
+ U8 num_subparts = (U8)(wearable_entry->mSubparts.size());
for (U8 index = 0; index < num_subparts; ++index)
{
@@ -1372,7 +1372,7 @@ void LLPanelEditWearable::updateScrollingPanelUI()
const LLEditWearableDictionary::WearableEntry *wearable_entry = LLEditWearableDictionary::getInstance()->getWearable(type);
llassert(wearable_entry);
if (!wearable_entry) return;
- U8 num_subparts = wearable_entry->mSubparts.size();
+ U8 num_subparts = (U8)(wearable_entry->mSubparts.size());
LLScrollingPanelParam::sUpdateDelayFrames = 0;
for (U8 index = 0; index < num_subparts; ++index)
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index 0a1efd564f..fa5938df04 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -2063,7 +2063,7 @@ void LLVOVolume::setNumTEs(const U8 num_tes)
}
else if(old_num_tes > num_tes && mMediaImplList.size() > num_tes) //old faces removed
{
- U8 end = mMediaImplList.size() ;
+ U8 end = (U8)(mMediaImplList.size()) ;
for(U8 i = num_tes; i < end ; i++)
{
removeMediaImpl(i) ;