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

Fix warnings.

Browse Source
This commit is contained in:
Inusaito Sayori
2015-06-19 17:28:09 -04:00
parent b11511b7b9
commit 8f2c92d198
7 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llcharacter/llgesture.cpp
View File

@@ -287,7 +287,7 @@ U8 *LLGestureList::serialize(U8 *buffer) const
htonmemcpy(buffer, &count, MVT_S32, 4);
buffer += sizeof(count);
for (S32 i = 0; i < count; i++)
for (U32 i = 0; i < count; i++)
{
buffer = mList[i]->serialize(buffer);
}

2
indra/llcommon/llerror.cpp
View File

@@ -569,7 +569,7 @@ namespace LLError
mTags(new const char*[tag_count]),
mTagCount(tag_count)
{
for (int i = 0; i < tag_count; i++)
for (size_t i = 0; i < tag_count; i++)
{
mTags[i] = tags[i];
}

2
indra/newview/daeexport.cpp
View File

@@ -104,7 +104,7 @@ namespace DAEExportUtil
// See if any of the inventory items matching this texture id are exportable
ExportPolicy policy = LFSimFeatureHandler::instance().exportPolicy();
for (S32 i = 0; i < items.size(); i++)
for (size_t i = 0; i < items.size(); i++)
{
const LLPermissions item_permissions = items[i]->getPermissions();
if (item_permissions.allowExportBy(gAgentID, policy))

4
indra/newview/llcompilequeue.cpp
View File

@@ -771,9 +771,9 @@ LLFloaterNotRunQueue::~LLFloaterNotRunQueue()
void LLFloaterCompileQueue::removeItemByItemID(const LLUUID& asset_id)
{
LL_INFOS() << "LLFloaterCompileQueue::removeItemByAssetID()" << LL_ENDL;
for(S32 i = 0; i < mCurrentScripts.size(); )
for(size_t i = 0; i < mCurrentScripts.size(); )
{
if(asset_id == mCurrentScripts.at(i)->getUUID())
if(asset_id == mCurrentScripts[i]->getUUID())
{
vector_replace_with_last(mCurrentScripts, mCurrentScripts.begin() + i);
}

6
indra/newview/llviewercontrol.cpp
View File

@@ -582,13 +582,13 @@ bool handleWindlightCloudChanged(const LLSD& new_value)
{
cloudNoiseFilename = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "windlight/clouds", "Default.tga");
}
llinfos << "loading WindLight cloud noise from " << cloudNoiseFilename << LL_ENDL;
LL_INFOS() << "loading WindLight cloud noise from " << cloudNoiseFilename << LL_ENDL;
LLPointer<LLImageFormatted> cloudNoiseFile(LLImageFormatted::createFromExtension(cloudNoiseFilename));
if (cloudNoiseFile.isNull())
{
llwarns << "Error: Failed to load cloud noise image " << cloudNoiseFilename << LL_ENDL;
LL_WARNS() << "Error: Failed to load cloud noise image " << cloudNoiseFilename << LL_ENDL;
return true;
}
@@ -599,7 +599,7 @@ bool handleWindlightCloudChanged(const LLSD& new_value)
if (cloudNoiseFile->decode(LLDrawPoolWLSky::sCloudNoiseRawImage, 0.0f))
{
//debug use
lldebugs << "cloud noise raw image width: " << LLDrawPoolWLSky::sCloudNoiseRawImage->getWidth() << " : height: " << LLDrawPoolWLSky::sCloudNoiseRawImage->getHeight() << " : components: " <<
LL_DEBUGS() << "cloud noise raw image width: " << LLDrawPoolWLSky::sCloudNoiseRawImage->getWidth() << " : height: " << LLDrawPoolWLSky::sCloudNoiseRawImage->getHeight() << " : components: " <<
(S32) LLDrawPoolWLSky::sCloudNoiseRawImage->getComponents() << " : data size: " << LLDrawPoolWLSky::sCloudNoiseRawImage->getDataSize() << LL_ENDL;
llassert_always(LLDrawPoolWLSky::sCloudNoiseRawImage->getData());

2
indra/newview/llviewerjointmesh.cpp
View File

@@ -110,7 +110,7 @@ static LLVector4 gJointPivot[32];
//-----------------------------------------------------------------------------
void LLViewerJointMesh::uploadJointMatrices()
{
S32 joint_num;
U32 joint_num;
LLPolyMesh *reference_mesh = mMesh->getReferenceMesh();
LLDrawPool *poolp = mFace ? mFace->getPool() : NULL;
BOOL hardware_skinning = (poolp && poolp->getVertexShaderLevel() > 0) ? TRUE : FALSE;

2
indra/newview/llvoavatar.cpp
View File

@@ -1716,7 +1716,7 @@ void LLVOAvatar::getSpatialExtents(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 (U32 joint_num = 0; joint_num < mesh->mJointRenderData.size(); joint_num++)
{
update_min_max(newMin, newMax, mesh->mJointRenderData[joint_num]->mWorldMatrix->getRow<LLMatrix4a::ROW_TRANS>());
}