Merge branch 'master' of git@github.com:singularity-viewer/SingularityViewer.git

This commit is contained in:
Shyotl
2013-04-20 01:01:26 -05:00
20 changed files with 386 additions and 272 deletions

View File

@@ -486,10 +486,14 @@ LLThreadSafeRefCount::LLThreadSafeRefCount() :
LLThreadSafeRefCount::~LLThreadSafeRefCount()
{
llassert(mRef == 0);
/* TEMPORARILY disable erroring out on deleting this object with
nonzero reference count until the problem in AIStateMachine is fixed
if (mRef != 0)
{
llerrs << "deleting non-zero reference" << llendl;
}
*/
}
//============================================================================