merge

2 files changed, 10 insertions, 8 deletions

diff --git a/indra/llui/llfolderviewitem.cpp b/indra/llui/llfolderviewitem.cpp
index ad18adddd5..f67c134751 100755
--- a/indra/llui/llfolderviewitem.cpp
+++ b/indra/llui/llfolderviewitem.cpp
@@ -409,7 +409,7 @@ void LLFolderViewItem::selectItem(void)
 BOOL LLFolderViewItem::isMovable()
 {
 	return getViewModelItem()->isItemMovable();
-	}
+}
 
 BOOL LLFolderViewItem::isRemovable()
 {
@@ -438,19 +438,19 @@ BOOL LLFolderViewItem::remove()
 		return FALSE;
 	}
 	return getViewModelItem()->removeItem();
-	}
+}
 
 // Build an appropriate context menu for the item.
 void LLFolderViewItem::buildContextMenu(LLMenuGL& menu, U32 flags)
 {
 	getViewModelItem()->buildContextMenu(menu, flags);
-	}
+}
 
 void LLFolderViewItem::openItem( void )
 {
 	if (mAllowOpen)
 	{
-	getViewModelItem()->openItem();
+		getViewModelItem()->openItem();
 	}
 }
 
diff --git a/indra/llui/llmultifloater.cpp b/indra/llui/llmultifloater.cpp
index 59faabd482..179b251cdb 100644
--- a/indra/llui/llmultifloater.cpp
+++ b/indra/llui/llmultifloater.cpp
@@ -37,10 +37,12 @@
 //
 
 LLMultiFloater::LLMultiFloater(const LLSD& key, const LLFloater::Params& params)
-	: LLFloater(key)
-	, mTabContainer(NULL)
-	, mTabPos(LLTabContainer::TOP)
-	, mAutoResize(TRUE)
+	: LLFloater(key),
+	  mTabContainer(NULL),
+	  mTabPos(LLTabContainer::TOP),
+	  mAutoResize(TRUE),
+	  mOrigMinWidth(params.min_width),
+	  mOrigMinHeight(params.min_height)
 {
 }