summaryrefslogtreecommitdiff
path: root/indra/newview/llpreview.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-03-29 18:07:39 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-03-29 18:07:39 +0100
commita85139cd7deaf87493012f6c7589f93ef40730d2 (patch)
tree056501dbea279f8b828d3ee4231e1e2d8c86da10 /indra/newview/llpreview.cpp
parent6507534ad49fd1207c77d3b2f2b4cdcc4b28ee6b (diff)
parenteb0aaff4aac1dcf9f238242c107df650584efdf9 (diff)
merge.
Diffstat (limited to 'indra/newview/llpreview.cpp')
-rw-r--r--indra/newview/llpreview.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/llpreview.cpp b/indra/newview/llpreview.cpp
index 99e0b82b8f..d5ec3a36c3 100644
--- a/indra/newview/llpreview.cpp
+++ b/indra/newview/llpreview.cpp
@@ -179,10 +179,9 @@ void LLPreview::onCommit()
// update the object itself.
if( item->getType() == LLAssetType::AT_OBJECT )
{
- LLVOAvatarSelf* avatarp = gAgent.getAvatarObject();
- if(avatarp)
+ if (isAgentAvatarValid())
{
- LLViewerObject* obj = avatarp->getWornAttachment( item->getUUID() );
+ LLViewerObject* obj = gAgentAvatarp->getWornAttachment( item->getUUID() );
if( obj )
{
LLSelectMgr::getInstance()->deselectAll();