Post merge compile fixes

--HG--
branch : avatar-pipeline

indra/newview/llfloatergesture.cpp

@@ -98,7 +98,7 @@ void LLFloaterGesture::done()
 		// we load only gesture folder without childred.
 		LLInventoryModel::cat_array_t* categories;
 		LLInventoryModel::item_array_t* items;
-		folder_ref_t unloaded_folders;
+		LLInventoryFetchDescendentsObserver::folder_ref_t unloaded_folders;
 		LL_DEBUGS("Gesture")<< "Get subdirs of Gesture Folder...." << LL_ENDL;
 		gInventory.getDirectDescendentsOf(mGestureFolderID, categories, items);
 		if (categories->empty())

indra/newview/llfloatergesture.h

@@ -39,6 +39,7 @@
 
 #include "llfloater.h"
 #include "llinventorymodel.h"
+#include "llinventoryobserver.h"
 #include "lldarray.h"
 
 class LLScrollContainer;

indra/newview/llfriendcard.cpp

@@ -33,6 +33,7 @@
 #include "llviewerprecompiledheaders.h"
 
 #include "llinventory.h"
+#include "llinventoryobserver.h"
 #include "lltrans.h"
 
 #include "llfriendcard.h"