merge changes for 5.0.2-release

1 files changed, 3 insertions, 0 deletions

diff --git a/indra/newview/llinventorymodel.h b/indra/newview/llinventorymodel.h
index 826d1f880d..dee1769172 100644
--- a/indra/newview/llinventorymodel.h
+++ b/indra/newview/llinventorymodel.h
@@ -287,6 +287,9 @@ public:
 	//    will search in the user's library folder instead of "My Inventory"
 	const LLUUID findLibraryCategoryUUIDForType(LLFolderType::EType preferred_type, 
 												bool create_folder = true);
+	// Returns user specified category for uploads, returns default id if there are no
+	// user specified one or it does not exist, creates default category if it is missing.
+	const LLUUID findUserDefinedCategoryUUIDForType(LLFolderType::EType preferred_type);
 	
 	// Get whatever special folder this object is a child of, if any.
 	const LLViewerInventoryCategory *getFirstNondefaultParent(const LLUUID& obj_id) const;