From cc54bea2167494d69a1fa9417b0c9891b28d9a1a Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Mon, 28 Oct 2013 17:16:51 -0700
Subject: [PATCH] fixed bad llasserts that didn't have terminating semicolon
---
indra/llcommon/llqueuedthread.cpp | 2 +-
indra/llmessage/llassetstorage.cpp | 4 ++--
indra/newview/llflexibleobject.cpp | 2 +-
indra/newview/llmeshrepository.cpp | 2 +-
indra/newview/llspatialpartition.cpp | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/indra/llcommon/llqueuedthread.cpp b/indra/llcommon/llqueuedthread.cpp
index 176761c17cd..8cef4293cd7 100755
--- a/indra/llcommon/llqueuedthread.cpp
+++ b/indra/llcommon/llqueuedthread.cpp
@@ -246,7 +246,7 @@ bool LLQueuedThread::addRequest(QueuedRequest* req)
// MAIN thread
bool LLQueuedThread::waitForResult(LLQueuedThread::handle_t handle, bool auto_complete)
{
- llassert (handle != nullHandle())
+ llassert (handle != nullHandle());
bool res = false;
bool waspaused = isPaused();
bool done = false;
diff --git a/indra/llmessage/llassetstorage.cpp b/indra/llmessage/llassetstorage.cpp
index 94552750f46..8ba2535531e 100755
--- a/indra/llmessage/llassetstorage.cpp
+++ b/indra/llmessage/llassetstorage.cpp
@@ -405,7 +405,7 @@ bool LLAssetStorage::findInStaticVFSAndInvokeCallback(const LLUUID& uuid, LLAsse
if (user_data)
{
// The *user_data should not be passed without a callback to clean it up.
- llassert(callback != NULL)
+ llassert(callback != NULL);
}
BOOL exists = mStaticVFS->getExists(uuid, type);
@@ -445,7 +445,7 @@ void LLAssetStorage::getAssetData(const LLUUID uuid, LLAssetType::EType type, LL
if (user_data)
{
// The *user_data should not be passed without a callback to clean it up.
- llassert(callback != NULL)
+ llassert(callback != NULL);
}
if (mShutDown)
diff --git a/indra/newview/llflexibleobject.cpp b/indra/newview/llflexibleobject.cpp
index c589bea6744..3cd43678912 100755
--- a/indra/newview/llflexibleobject.cpp
+++ b/indra/newview/llflexibleobject.cpp
@@ -660,7 +660,7 @@ void LLVolumeImplFlexible::doFlexibleUpdate()
mSection[i].mdPosition = (mSection[i].mPosition - mSection[i-1].mPosition) * inv_section_length;
// Create points
- llassert(mRenderRes > -1)
+ llassert(mRenderRes > -1);
S32 num_render_sections = 1<<mRenderRes;
if (path->getPathLength() != num_render_sections+1)
{
diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp
index 77ea965136d..a876e1f755a 100755
--- a/indra/newview/llmeshrepository.cpp
+++ b/indra/newview/llmeshrepository.cpp
@@ -736,7 +736,7 @@ void LLMeshRepoThread::loadMeshLOD(const LLVolumeParams& mesh_params, S32 lod)
if (pending != mPendingLOD.end())
{ //append this lod request to existing header request
pending->second.push_back(lod);
- llassert(pending->second.size() <= LLModel::NUM_LODS)
+ llassert(pending->second.size() <= LLModel::NUM_LODS);
}
else
{ //if no header request is pending, fetch header
diff --git a/indra/newview/llspatialpartition.cpp b/indra/newview/llspatialpartition.cpp
index 55c0acd3f95..86d1948baa5 100755
--- a/indra/newview/llspatialpartition.cpp
+++ b/indra/newview/llspatialpartition.cpp
@@ -1201,7 +1201,7 @@ class LLOctreeCullVisExtents: public LLOctreeCullShadow
{
LLSpatialGroup* group = (LLSpatialGroup*)base_group;
- llassert(!group->hasState(LLSpatialGroup::DIRTY) && !group->isEmpty())
+ llassert(!group->hasState(LLSpatialGroup::DIRTY) && !group->isEmpty());
if (mRes < 2)
{
--
GitLab