summaryrefslogtreecommitdiff
path: root/indra/newview/llwearable.cpp
diff options
context:
space:
mode:
authorDebi King (Dessie) <dessie@lindenlab.com>2012-02-22 14:02:15 -0500
committerDebi King (Dessie) <dessie@lindenlab.com>2012-02-22 14:02:15 -0500
commit167a7dcd2fec57c8f93e3731679ea61bbd040b79 (patch)
tree970a8ea7bf976ca1ae74a37103452219d4027289 /indra/newview/llwearable.cpp
parente5f81fdcc98ded831c48c4e31a4a215877e0a1e4 (diff)
parent52782548c83dc0ca0fc8352e1a3ad68784116a91 (diff)
merge
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;