EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release

Actual action: branched maintenance-r68118, merged in release, then copied result into release

1 files changed, 7 insertions, 1 deletions

diff --git a/indra/newview/llpreview.cpp b/indra/newview/llpreview.cpp
index c1885ad898..e52710ca75 100644
--- a/indra/newview/llpreview.cpp
+++ b/indra/newview/llpreview.cpp
@@ -280,12 +280,18 @@ bool LLPreview::save( const LLUUID& item_uuid, LLPointer<LLInventoryItem>* itemp
 }
 
 // static
-void LLPreview::hide(const LLUUID& item_uuid)
+void LLPreview::hide(const LLUUID& item_uuid, BOOL no_saving /* = FALSE */ )
 {
 	preview_map_t::iterator found_it = LLPreview::sInstances.find(item_uuid);
 	if(found_it != LLPreview::sInstances.end())
 	{
 		LLPreview* instance = found_it->second;
+
+		if ( no_saving )
+		{
+			instance->mForceClose = TRUE;
+		}
+
 		instance->close();
 	}
 }