Second Life viewer sources 1.17.0.12

1 files changed, 10 insertions, 7 deletions

diff --git a/linden/indra/newview/llpreview.cpp b/linden/indra/newview/llpreview.cpp
index 7137f85..9b2d3f8 100644
--- a/linden/indra/newview/llpreview.cpp
+++ b/linden/indra/newview/llpreview.cpp
@@ -70,7 +70,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, LLPointer<LLViewerInventoryItem> inv_item )
 :       LLFloater(name, rect, title, allow_resize, min_width, min_height ),
         mItemUUID(item_uuid),
         mSourceID(LLUUID::null),
@@ -79,7 +79,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
@@ -154,9 +155,11 @@ void LLPreview::setSourceID(const LLUUID& source_id)
         sPreviewsBySource.insert(preview_multimap_t::value_type(mSourceID, mViewHandle));
 }
 
-LLViewerInventoryItem* LLPreview::getItem() const
+const LLViewerInventoryItem *LLPreview::getItem() const
 {
-        LLViewerInventoryItem* item = NULL;
+        if(mItem)
+                return mItem;
+        const LLViewerInventoryItem *item = NULL;
         if(mObjectUUID.isNull())
         {
                 // it's an inventory item, so get the item.
@@ -177,7 +180,7 @@ LLViewerInventoryItem* LLPreview::getItem() const
 // Sub-classes should override this function if they allow editing
 void LLPreview::onCommit()
 {
-        LLViewerInventoryItem* item = getItem();
+        const LLViewerInventoryItem *item = getItem();
         if(item)
         {
                 if (!item->isComplete())
@@ -350,7 +353,7 @@ BOOL LLPreview::handleHover(S32 x, S32 y, MASK mask)
         {
                 S32 screen_x;
                 S32 screen_y;
-                LLViewerInventoryItem *item = getItem();
+                const LLViewerInventoryItem *item = getItem();
 
                 localPointToScreen(x, y, &screen_x, &screen_y );
                 if(item
@@ -436,7 +439,7 @@ void LLPreview::onDiscardBtn(void* data)
 {
         LLPreview* self = (LLPreview*)data;
 
-        LLViewerInventoryItem* item = self->getItem();
+        const LLViewerInventoryItem* item = self->getItem();
         if (!item) return;
 
         self->mForceClose = TRUE;