Merged working branch of 1.2 into LL 1.23 merge

1 files changed, 11 insertions, 1 deletions

diff --git a/linden/indra/newview/llfolderview.h b/linden/indra/newview/llfolderview.h
index b46b5c8..5e6902d 100644
--- a/linden/indra/newview/llfolderview.h
+++ b/linden/indra/newview/llfolderview.h
@@ -339,6 +339,16 @@ protected:
 
         std::string                                     mLabel;
         std::string                                     mSearchableLabel;
+
+        std::string                                     mLabelCreator;
+        std::string                                     mSearchableLabelCreator;
+
+        std::string                                     mLabelDesc;
+        std::string                                     mSearchableLabelDesc;
+
+        std::string                                     mLabelAll;
+        std::string                                     mSearchableLabelAll;
+
         std::string                                     mType;
         S32                                                     mLabelWidth;
         U32                                                     mCreationDate;
@@ -465,7 +475,7 @@ public:
         // viewed. This method will ask the viewed object itself.
         const std::string& getName( void ) const;
 
-        const std::string& getSearchableLabel( void ) const;
+        const std::string& getSearchableLabel( U32 search_type ) const;
 
         // This method returns the label displayed on the view. This
         // method was primarily added to allow sorting on the folder