Skip to content
Snippets Groups Projects
Commit 6f52f1e5 authored by Eric M. Tulla (BigPapi)'s avatar Eric M. Tulla (BigPapi)
Browse files

Post merge compile fixes

--HG--
branch : avatar-pipeline
parent 3194c891
No related branches found
No related tags found
No related merge requests found
...@@ -98,7 +98,7 @@ void LLFloaterGesture::done() ...@@ -98,7 +98,7 @@ void LLFloaterGesture::done()
// we load only gesture folder without childred. // we load only gesture folder without childred.
LLInventoryModel::cat_array_t* categories; LLInventoryModel::cat_array_t* categories;
LLInventoryModel::item_array_t* items; 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; LL_DEBUGS("Gesture")<< "Get subdirs of Gesture Folder...." << LL_ENDL;
gInventory.getDirectDescendentsOf(mGestureFolderID, categories, items); gInventory.getDirectDescendentsOf(mGestureFolderID, categories, items);
if (categories->empty()) if (categories->empty())
......
...@@ -39,6 +39,7 @@ ...@@ -39,6 +39,7 @@
#include "llfloater.h" #include "llfloater.h"
#include "llinventorymodel.h" #include "llinventorymodel.h"
#include "llinventoryobserver.h"
#include "lldarray.h" #include "lldarray.h"
class LLScrollContainer; class LLScrollContainer;
......
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
#include "llviewerprecompiledheaders.h" #include "llviewerprecompiledheaders.h"
#include "llinventory.h" #include "llinventory.h"
#include "llinventoryobserver.h"
#include "lltrans.h" #include "lltrans.h"
#include "llfriendcard.h" #include "llfriendcard.h"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment