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

40
indra/newview/llspatialpartition.cpp
View File

@@ -129,7 +129,7 @@ void sg_assert(BOOL expr)
#if LL_OCTREE_PARANOIA_CHECK
if (!expr)
{
llerrs << "Octree invalid!" << llendl;
LL_ERRS() << "Octree invalid!" << LL_ENDL;
}
#endif
}
@@ -346,7 +346,7 @@ LLSpatialGroup::~LLSpatialGroup()
{
/*if (sNoDelete)
{
llerrs << "Illegal deletion of LLSpatialGroup!" << llendl;
LL_ERRS() << "Illegal deletion of LLSpatialGroup!" << LL_ENDL;
}*/
if (gDebugGL)
@@ -428,7 +428,7 @@ void LLSpatialGroup::validate()
LLSpatialPartition* part = drawable->asPartition();
if (!part)
{
llerrs << "Drawable reports it is a spatial bridge but not a partition." << llendl;
LL_ERRS() << "Drawable reports it is a spatial bridge but not a partition." << LL_ENDL;
}
LLSpatialGroup* group = (LLSpatialGroup*) part->mOctree->getListener(0);
group->validate();
@@ -630,7 +630,7 @@ BOOL LLSpatialGroup::boundObjects(BOOL empty, LLVector4a& minOut, LLVector4a& ma
{ //don't do anything if there are no objects
if (empty && mOctreeNode->getParent())
{ //only root is allowed to be empty
OCT_ERRS << "Empty leaf found in octree." << llendl;
OCT_ERRS << "Empty leaf found in octree." << LL_ENDL;
}
return FALSE;
}
@@ -747,7 +747,7 @@ BOOL LLSpatialGroup::removeObject(LLDrawable *drawablep, BOOL from_octree)
{
if (!mOctreeNode->remove(drawablep))
{
OCT_ERRS << "Could not remove drawable from spatial group" << llendl;
OCT_ERRS << "Could not remove drawable from spatial group" << LL_ENDL;
}
}
else
@@ -1095,7 +1095,7 @@ void LLSpatialGroup::updateDistance(LLCamera &camera)
{
if (LLViewerCamera::sCurCameraID != LLViewerCamera::CAMERA_WORLD)
{
llwarns << "Attempted to update distance for camera other than world camera!" << llendl;
LL_WARNS() << "Attempted to update distance for camera other than world camera!" << LL_ENDL;
return;
}
@@ -1107,7 +1107,7 @@ void LLSpatialGroup::updateDistance(LLCamera &camera)
#if !LL_RELEASE_FOR_DOWNLOAD
if (isState(LLSpatialGroup::OBJECT_DIRTY))
{
llerrs << "Spatial group dirty on distance update." << llendl;
LL_ERRS() << "Spatial group dirty on distance update." << LL_ENDL;
}
#endif
if (!isEmpty() /*&& !LLSpatialPartition::sFreezeState*/)
@@ -1306,7 +1306,7 @@ void LLSpatialGroup::handleChildAddition(const OctreeNode* parent, OctreeNode* c
}
else
{
OCT_ERRS << "LLSpatialGroup redundancy detected." << llendl;
OCT_ERRS << "LLSpatialGroup redundancy detected." << LL_ENDL;
}
unbound();
@@ -1704,7 +1704,7 @@ BOOL LLSpatialPartition::remove(LLDrawable *drawablep, LLSpatialGroup *curp)
{
if (!curp->removeObject(drawablep))
{
OCT_ERRS << "Failed to remove drawable from octree!" << llendl;
OCT_ERRS << "Failed to remove drawable from octree!" << LL_ENDL;
}
else
{
@@ -1724,7 +1724,7 @@ void LLSpatialPartition::move(LLDrawable *drawablep, LLSpatialGroup *curp, BOOL
// who was seeing crashing here. (See VWR-424 reported by Bunny Mayne)
if (!drawablep)
{
OCT_ERRS << "LLSpatialPartition::move was passed a bad drawable." << llendl;
OCT_ERRS << "LLSpatialPartition::move was passed a bad drawable." << LL_ENDL;
return;
}
@@ -1741,7 +1741,7 @@ void LLSpatialPartition::move(LLDrawable *drawablep, LLSpatialGroup *curp, BOOL
}
else
{
OCT_ERRS << "Drawable lost between spatial partitions on outbound transition." << llendl;
OCT_ERRS << "Drawable lost between spatial partitions on outbound transition." << LL_ENDL;
}
}
@@ -1756,7 +1756,7 @@ void LLSpatialPartition::move(LLDrawable *drawablep, LLSpatialGroup *curp, BOOL
LLPointer<LLDrawable> ptr = drawablep;
if (curp && !remove(drawablep, curp))
{
OCT_ERRS << "Move couldn't find existing spatial group!" << llendl;
OCT_ERRS << "Move couldn't find existing spatial group!" << LL_ENDL;
}
put(drawablep, was_visible);
@@ -2691,7 +2691,7 @@ void renderUpdateType(LLDrawable* drawablep)
gGL.diffuseColor4f(0,0,1,0.5f);
break;
default:
llwarns << "Unknown update_type " << vobj->getLastUpdateType() << llendl;
LL_WARNS() << "Unknown update_type " << vobj->getLastUpdateType() << LL_ENDL;
break;
};
S32 num_faces = drawablep->getNumFaces();
@@ -3340,7 +3340,7 @@ void renderPhysicsShape(LLDrawable* drawable, LLVOVolume* volume)
}
else
{
llerrs << "Unhandled type" << llendl;
LL_ERRS() << "Unhandled type" << LL_ENDL;
}
gGL.popMatrix();
@@ -4003,11 +4003,11 @@ public:
{
if (facep->mDrawInfo->mTextureList.size() <= index)
{
llerrs << "Face texture index out of bounds." << llendl;
LL_ERRS() << "Face texture index out of bounds." << LL_ENDL;
}
else if (facep->mDrawInfo->mTextureList[index] != facep->getTexture())
{
llerrs << "Face texture index incorrect." << llendl;
LL_ERRS() << "Face texture index incorrect." << LL_ENDL;
}
}
}
@@ -4168,7 +4168,7 @@ public:
{
if (mInheritedMask[i] && !(group->mOcclusionState[i] & mInheritedMask[i]))
{
llerrs << "Spatial group failed inherited mask test." << llendl;
LL_ERRS() << "Spatial group failed inherited mask test." << LL_ENDL;
}
}
@@ -4185,7 +4185,7 @@ public:
{
if (!parent->isState(state))
{
llerrs << "Spatial group failed parent state check." << llendl;
LL_ERRS() << "Spatial group failed parent state check." << LL_ENDL;
}
parent = parent->getParent();
}
@@ -4497,7 +4497,7 @@ LLDrawInfo::~LLDrawInfo()
{
/*if (LLSpatialGroup::sNoDelete)
{
llerrs << "LLDrawInfo deleted illegally!" << llendl;
LL_ERRS() << "LLDrawInfo deleted illegally!" << LL_ENDL;
}*/
if (mFace)
@@ -4543,7 +4543,7 @@ void LLCullResult::assertDrawMapsEmpty()
{
if (hasRenderMap(i))
{
llerrs << "Stale LLDrawInfo's in LLCullResult!" << llendl;
LL_ERRS() << "Stale LLDrawInfo's in LLCullResult!" << LL_ENDL;
}
}
}