summaryrefslogtreecommitdiff
path: root/indra/newview/llwearable.cpp
diff options
context:
space:
mode:
authorKitty Barnett <develop@catznip.com>2012-03-25 15:25:35 +0200
committerKitty Barnett <develop@catznip.com>2012-03-25 15:25:35 +0200
commit911472ed08490cbc08ba5009be82b247c51102a7 (patch)
treef9d5efb2e0037e5b602f2be23120910c40b94919 /indra/newview/llwearable.cpp
parente0d1ddab212103ba11a72783ce3b0a26ea8c0c55 (diff)
parentb187aeb8f177bd76e792652e773617beff18b47b (diff)
Merge with viewer-release
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;