diff options
| author | Kelly Washington <kelly@lindenlab.com> | 2007-05-30 17:39:09 +0000 |
|---|---|---|
| committer | Kelly Washington <kelly@lindenlab.com> | 2007-05-30 17:39:09 +0000 |
| commit | 3e9872a297c3cf3f929e688e0e89a78f6bc050f5 (patch) | |
| tree | ab3877f764cc27dbdca0b683f07e6ea3a3ac8a23 /indra/newview/llpreview.cpp | |
| parent | 7b61f1d0ec30e97fd3b7c5caf4b0e675c6e9a1f5 (diff) | |
merge -r61423:62602 svn/branches/maintenance --> release
Diffstat (limited to 'indra/newview/llpreview.cpp')
| -rw-r--r-- | indra/newview/llpreview.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/llpreview.cpp b/indra/newview/llpreview.cpp index 7c00742122..562e4c37c1 100644 --- a/indra/newview/llpreview.cpp +++ b/indra/newview/llpreview.cpp @@ -50,7 +50,7 @@ LLPreview::LLPreview(const std::string& name) : mAutoFocus = FALSE; } -LLPreview::LLPreview(const std::string& name, const LLRect& rect, const std::string& title, const LLUUID& item_uuid, const LLUUID& object_uuid, BOOL allow_resize, S32 min_width, S32 min_height ) +LLPreview::LLPreview(const std::string& name, const LLRect& rect, const std::string& title, const LLUUID& item_uuid, const LLUUID& object_uuid, BOOL allow_resize, S32 min_width, S32 min_height, LLViewerInventoryItem* inv_item ) : LLFloater(name, rect, title, allow_resize, min_width, min_height ), mItemUUID(item_uuid), mSourceID(LLUUID::null), @@ -59,7 +59,8 @@ LLPreview::LLPreview(const std::string& name, const LLRect& rect, const std::str mForceClose( FALSE ), mUserResized(FALSE), mCloseAfterSave(FALSE), - mAssetStatus(PREVIEW_ASSET_UNLOADED) + mAssetStatus(PREVIEW_ASSET_UNLOADED), + mItem(inv_item) { mAuxItem = new LLInventoryItem; // don't necessarily steal focus on creation -- sometimes these guys pop up without user action @@ -136,6 +137,8 @@ void LLPreview::setSourceID(const LLUUID& source_id) LLViewerInventoryItem* LLPreview::getItem() const { + if(mItem != NULL) + return mItem; LLViewerInventoryItem* item = NULL; if(mObjectUUID.isNull()) { |