summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerpartsource.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2014-05-07 11:09:04 -0400
committerOz Linden <oz@lindenlab.com>2014-05-07 11:09:04 -0400
commita98b4b6bee1b062722ce5eb03948a0fd33b74265 (patch)
tree88c030cef0c480f19ab9ff0a187b5c866da3a24a /indra/newview/llviewerpartsource.cpp
parent9353868d91dfe2c4539c81c0b96bfe9efb497b2c (diff)
parentd0ef02c23a7a37c8c9bfe3a86bae88bb811fc9fe (diff)
merge changes for 3.7.7-release
Diffstat (limited to 'indra/newview/llviewerpartsource.cpp')
-rwxr-xr-xindra/newview/llviewerpartsource.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewerpartsource.cpp b/indra/newview/llviewerpartsource.cpp
index b6bbd6140d..a7fd2e0fe4 100755
--- a/indra/newview/llviewerpartsource.cpp
+++ b/indra/newview/llviewerpartsource.cpp
@@ -69,7 +69,7 @@ void LLViewerPartSource::updatePart(LLViewerPart &part, const F32 dt)
void LLViewerPartSource::update(const F32 dt)
{
- llerrs << "Creating default part source!" << llendl;
+ LL_ERRS() << "Creating default part source!" << LL_ENDL;
}
LLUUID LLViewerPartSource::getImageUUID() const
@@ -396,7 +396,7 @@ void LLViewerPartSourceScript::update(const F32 dt)
{
part->mPosAgent = mPosAgent;
part->mVelocity.setVec(0.f, 0.f, 0.f);
- //llwarns << "Unknown source pattern " << (S32)mPartSysData.mPattern << llendl;
+ //LL_WARNS() << "Unknown source pattern " << (S32)mPartSysData.mPattern << LL_ENDL;
}
if (part->mFlags & LLPartData::LL_PART_FOLLOW_SRC_MASK || // SVC-193, VWR-717