diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-14 10:18:13 +0100 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-14 10:18:13 +0100 |
commit | 168ef83bcfae2a03c385a91a70e12a6fc773e3c5 (patch) | |
tree | 47c634a7ed0d6b4ec8ed7711bbc4cf880f7daaba /indra/newview/llpreview.cpp | |
parent | f480e1e8fc8d5e7f0c10eec26e03430e5aed8eaa (diff) | |
parent | 8dd62863092b10e012db20e818e72b53fd2ed84a (diff) |
slightly hairy merge from viewer-trunk
Diffstat (limited to 'indra/newview/llpreview.cpp')
-rw-r--r-- | indra/newview/llpreview.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpreview.cpp b/indra/newview/llpreview.cpp index d0db77dcbe..dd31a62642 100644 --- a/indra/newview/llpreview.cpp +++ b/indra/newview/llpreview.cpp @@ -138,7 +138,7 @@ void LLPreview::onCommit() const LLViewerInventoryItem *item = dynamic_cast<const LLViewerInventoryItem*>(getItem()); if(item) { - if (!item->isComplete()) + if (!item->isFinished()) { // We are attempting to save an item that was never loaded llwarns << "LLPreview::onCommit() called with mIsComplete == FALSE" |