summaryrefslogtreecommitdiff
path: root/indra/newview/llwearable.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2012-04-09 18:11:34 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2012-04-09 18:11:34 -0400
commitaf74e5e443934659e8a8a193980e6683e14e7fa1 (patch)
treeb26b8edae4aadcebdd029d9f76f384dc5fc7be94 /indra/newview/llwearable.cpp
parente4cced82343391292e61db03bb019e19827834c7 (diff)
parentb187aeb8f177bd76e792652e773617beff18b47b (diff)
merge viewer-release to runway
Diffstat (limited to 'indra/newview/llwearable.cpp')
-rw-r--r--indra/newview/llwearable.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llwearable.cpp b/indra/newview/llwearable.cpp
index d8aa0b7d5c..0f7f63061b 100644
--- a/indra/newview/llwearable.cpp
+++ b/indra/newview/llwearable.cpp
@@ -221,7 +221,7 @@ void LLWearable::createVisualParams()
param->resetDrivenParams();
if(!param->linkDrivenParams(boost::bind(wearable_function,(LLWearable*)this, _1), false))
{
- if( !param->linkDrivenParams(boost::bind(avatar_function,gAgentAvatarp,_1 ), true))
+ if( !param->linkDrivenParams(boost::bind(avatar_function,gAgentAvatarp.get(),_1 ), true))
{
llwarns << "could not link driven params for wearable " << getName() << " id: " << param->getID() << llendl;
continue;