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

2015-06-25 20:16:30 -05:00
parent 09f4528bfb
commit 9f10d9510d
71 changed files with 4962 additions and 3452 deletions
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -903,6 +903,11 @@ void LLInventoryView::toggleFindOptions()
 	}
 }

+LLFolderView* LLInventoryView::getRootFolder() const
+{
+	return mActivePanel ? (mActivePanel->getRootFolder()) : NULL;
+}
+
 void LLInventoryView::setSelectCallback(const LLFolderView::signal_t::slot_type& cb)
 {
 	getChild<LLInventoryPanel>("All Items")->setSelectCallback(cb);