summaryrefslogtreecommitdiff
path: root/indra/lscript/lscript_execute/llscriptresourceconsumer.cpp
diff options
context:
space:
mode:
authorRichard Linden <none@none>2014-02-19 12:32:08 -0800
committerRichard Linden <none@none>2014-02-19 12:32:08 -0800
commitef591d280eb3c5bae7da20540ad4cbb30858d0aa (patch)
treeff387e884e25eaa8a47adff4110ce02edfe67387 /indra/lscript/lscript_execute/llscriptresourceconsumer.cpp
parentce7e19d33a74e89059c2196da9c439d0eb9b21c1 (diff)
parent6661628d5c68855ddffc54a3f2578f93ada84de1 (diff)
Merge with release
Diffstat (limited to 'indra/lscript/lscript_execute/llscriptresourceconsumer.cpp')
-rwxr-xr-xindra/lscript/lscript_execute/llscriptresourceconsumer.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/lscript/lscript_execute/llscriptresourceconsumer.cpp b/indra/lscript/lscript_execute/llscriptresourceconsumer.cpp
index 55d47b6de2..0ce5eb7dab 100755
--- a/indra/lscript/lscript_execute/llscriptresourceconsumer.cpp
+++ b/indra/lscript/lscript_execute/llscriptresourceconsumer.cpp
@@ -56,7 +56,7 @@ bool LLScriptResourceConsumer::switchScriptResourcePools(LLScriptResourcePool& n
{
if (&new_pool == &LLScriptResourcePool::null)
{
- llwarns << "New pool is null" << llendl;
+ LL_WARNS() << "New pool is null" << LL_ENDL;
}
if (isInPool(new_pool))