diff options
author | Josh Bell <josh@lindenlab.com> | 2007-01-15 18:49:02 +0000 |
---|---|---|
committer | Josh Bell <josh@lindenlab.com> | 2007-01-15 18:49:02 +0000 |
commit | aeb6d0c93c1122c1320f99c1a652a5e2f1d60d52 (patch) | |
tree | 5aedb2a22e54d9c2c2fe9389d4ad6cebe891c5f1 /indra/newview/llpreview.cpp | |
parent | dbf45ad4294a59c050982b5a417fe86272026454 (diff) |
svn merge -r 56599:56738 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
Diffstat (limited to 'indra/newview/llpreview.cpp')
-rw-r--r-- | indra/newview/llpreview.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/indra/newview/llpreview.cpp b/indra/newview/llpreview.cpp index 82974da634..23f5b381ca 100644 --- a/indra/newview/llpreview.cpp +++ b/indra/newview/llpreview.cpp @@ -286,12 +286,7 @@ void LLPreview::hide(const LLUUID& item_uuid) if(found_it != LLPreview::sInstances.end()) { LLPreview* instance = found_it->second; - if( instance->getParent() ) - { - instance->getParent()->removeChild( instance ); - } - - delete instance; + instance->close(); } } |