summaryrefslogtreecommitdiff
path: root/indra/newview/llpreview.cpp
diff options
context:
space:
mode:
authorAimee Linden <aimee@lindenlab.com>2010-03-29 17:53:21 +0100
committerAimee Linden <aimee@lindenlab.com>2010-03-29 17:53:21 +0100
commiteb0aaff4aac1dcf9f238242c107df650584efdf9 (patch)
treeb07b612c33f23e820492b06488a8c406856b64c8 /indra/newview/llpreview.cpp
parentfc0906d6e8c1238fe7fd21c185957ca89511e76e (diff)
parentb6e7850c0a3d65ed0a1501e19a1655055000e32f (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();