Initial AISv3 merge. New HTTP messages not plugged in yet.

indra/newview/llinventorypanel.cpp

@@ -145,7 +145,8 @@ LLInventoryPanel::LLInventoryPanel(const std::string& name,
 	mInventory(inventory),
 	mAllowMultiSelect(allow_multi_select),
 	mViewsInitialized(false),
-	mInvFVBridgeBuilder(NULL)
+	mInvFVBridgeBuilder(NULL),
+	mGroupedItemBridge(new LLFolderViewGroupedItemBridge)
 {
 	mInvFVBridgeBuilder = &INVENTORY_BRIDGE_BUILDER;
 
@@ -172,7 +173,7 @@ void LLInventoryPanel::buildFolderView()
 	else
 	{
 		root_id = (preferred_type != LLFolderType::FT_NONE)
-				? gInventory.findCategoryUUIDForType(preferred_type, false, false)
+				? gInventory.findCategoryUUIDForType(preferred_type, false)
 				: gInventory.getCategory(static_cast<LLUUID>(mStartFolder)) ? static_cast<LLUUID>(mStartFolder) // Singu Note: if start folder is an id of a folder, use it
 				: LLUUID::null;
 	}
@@ -695,7 +696,8 @@ LLFolderView * LLInventoryPanel::createFolderView(LLInvFVBridge * bridge, bool u
 	folder_rect, 
 	LLUUID::null, 
 	this, 
-	bridge);
+	bridge,
+	mGroupedItemBridge);
 	ret->setAllowMultiSelect(mAllowMultiSelect);
 	return ret;
 }