Second Life viewer sources 1.15.1.3

1 files changed, 17 insertions, 7 deletions

diff --git a/linden/indra/newview/llpreview.cpp b/linden/indra/newview/llpreview.cpp
index 347c6d5..23f31aa 100644
--- a/linden/indra/newview/llpreview.cpp
+++ b/linden/indra/newview/llpreview.cpp
@@ -60,6 +60,7 @@ LLPreview::LLPreview(const std::string& name) :
         LLFloater(name),
         mCopyToInvBtn(NULL),
         mForceClose(FALSE),
+        mUserResized(FALSE),
         mCloseAfterSave(FALSE),
         mAssetStatus(PREVIEW_ASSET_UNLOADED)
 {
@@ -76,6 +77,7 @@ LLPreview::LLPreview(const std::string& name, const LLRect& rect, const std::str
         mObjectUUID(object_uuid),
         mCopyToInvBtn( NULL ),
         mForceClose( FALSE ),
+        mUserResized(FALSE),
         mCloseAfterSave(FALSE),
         mAssetStatus(PREVIEW_ASSET_UNLOADED)
 {
@@ -189,8 +191,6 @@ void LLPreview::onCommit()
                 }
                 
                 LLPointer<LLViewerInventoryItem> new_item = new LLViewerInventoryItem(item);
-                BOOL has_sale_info = FALSE;
-                LLSaleInfo sale_info;
                 new_item->setDescription(childGetText("desc"));
                 if(mObjectUUID.notNull())
                 {
@@ -222,11 +222,6 @@ void LLPreview::onCommit()
                                                 gSelectMgr->deselectAll();
                                                 gSelectMgr->addAsIndividual( obj, SELECT_ALL_TES, FALSE );
                                                 gSelectMgr->selectionSetObjectDescription( childGetText("desc") );
-                                        
-                                                if( has_sale_info )
-                                                {
-                                                        gSelectMgr->selectionSetObjectSaleInfo( sale_info );
-                                                }
 
                                                 gSelectMgr->deselectAll();
                                         }
@@ -487,6 +482,12 @@ LLPreview* LLPreview::getFirstPreviewForSource(const LLUUID& source_id)
         return NULL;
 }
 
+void LLPreview::userSetShape(const LLRect& new_rect)
+{
+        userResized();
+        LLView::userSetShape(new_rect);
+}
+
 //
 // LLMultiPreview
 //
@@ -506,6 +507,15 @@ void LLMultiPreview::open()		/*Flawfinder: ignore*/
         }
 }
 
+
+void LLMultiPreview::userSetShape(const LLRect& new_rect)
+{
+        LLPreview* frontmost_preview = (LLPreview*)mTabContainer->getCurrentPanel();
+        if (frontmost_preview) frontmost_preview->userResized();
+        LLView::userSetShape(new_rect);
+}
+
+
 void LLMultiPreview::tabOpen(LLFloater* opened_floater, bool from_click)
 {
         LLPreview* opened_preview = (LLPreview*)opened_floater;