diff options
author | Oz Linden <oz@lindenlab.com> | 2014-05-07 11:09:04 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2014-05-07 11:09:04 -0400 |
commit | a98b4b6bee1b062722ce5eb03948a0fd33b74265 (patch) | |
tree | 88c030cef0c480f19ab9ff0a187b5c866da3a24a /indra/lscript/lscript_execute/llscriptresourceconsumer.cpp | |
parent | 9353868d91dfe2c4539c81c0b96bfe9efb497b2c (diff) | |
parent | d0ef02c23a7a37c8c9bfe3a86bae88bb811fc9fe (diff) |
merge changes for 3.7.7-release
Diffstat (limited to 'indra/lscript/lscript_execute/llscriptresourceconsumer.cpp')
-rwxr-xr-x | indra/lscript/lscript_execute/llscriptresourceconsumer.cpp | 2 |
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)) |