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

No longer include llerrorlegacy.h. Updated llstl to include deletion utilites.

Browse Source
This commit is contained in:
Shyotl
2015-06-19 03:54:20 -05:00
parent 283f5298d5
commit 1c627317ec
634 changed files with 8200 additions and 12214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
indra/newview/llsurface.cpp
View File

@@ -125,7 +125,7 @@ LLSurface::~LLSurface()
LLDrawPoolTerrain *poolp = (LLDrawPoolTerrain*) gPipeline.findPool(LLDrawPool::POOL_TERRAIN, mSTexturep);
if (!poolp)
{
llwarns << "No pool for terrain on destruction!" << llendl;
LL_WARNS() << "No pool for terrain on destruction!" << LL_ENDL;
}
else if (poolp->mReferences.empty())
{
@@ -142,7 +142,7 @@ LLSurface::~LLSurface()
}
else
{
llerrs << "Terrain pool not empty!" << llendl;
LL_ERRS() << "Terrain pool not empty!" << LL_ENDL;
}
}
@@ -898,7 +898,7 @@ void LLSurface::decompressDCTPatch(LLBitPack &bitpack, LLGroupHeader *gopp, BOOL
if ((i >= mPatchesPerEdge) || (j >= mPatchesPerEdge))
{
llwarns << "Received invalid terrain packet - patch header patch ID incorrect!"
LL_WARNS() << "Received invalid terrain packet - patch header patch ID incorrect!"
<< " patches per edge " << mPatchesPerEdge
<< " i " << i
<< " j " << j
@@ -906,7 +906,7 @@ void LLSurface::decompressDCTPatch(LLBitPack &bitpack, LLGroupHeader *gopp, BOOL
<< " range " << (S32)ph.range
<< " quant_wbits " << (S32)ph.quant_wbits
<< " patchids " << (S32)ph.patchids
<< llendl;
<< LL_ENDL;
LLAppViewer::instance()->badNetworkHandler();
return;
}
@@ -1144,13 +1144,13 @@ LLSurfacePatch *LLSurface::resolvePatchRegion(const F32 x, const F32 y) const
{
if(0 == mNumberOfPatches)
{
llwarns << "No patches for current region!" << llendl;
LL_WARNS() << "No patches for current region!" << LL_ENDL;
return NULL;
}
S32 old_index = index;
index = llclamp(old_index, 0, (mNumberOfPatches - 1));
llwarns << "Clamping out of range patch index " << old_index
<< " to " << index << llendl;
LL_WARNS() << "Clamping out of range patch index " << old_index
<< " to " << index << LL_ENDL;
}
return &(mPatchList[index]);
}
@@ -1339,12 +1339,12 @@ LLSurfacePatch *LLSurface::getPatch(const S32 x, const S32 y) const
{
if ((x < 0) || (x >= mPatchesPerEdge))
{
llwarns << "Asking for patch out of bounds" << llendl;
LL_WARNS() << "Asking for patch out of bounds" << LL_ENDL;
return NULL;
}
if ((y < 0) || (y >= mPatchesPerEdge))
{
llwarns << "Asking for patch out of bounds" << llendl;
LL_WARNS() << "Asking for patch out of bounds" << LL_ENDL;
return NULL;
}
@@ -1383,7 +1383,7 @@ void LLSurface::setWaterHeight(F32 height)
}
else
{
llwarns << "LLSurface::setWaterHeight with no water object!" << llendl;
LL_WARNS() << "LLSurface::setWaterHeight with no water object!" << LL_ENDL;
}
}