Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

This might just fix the double inventory thing

Browse Source
This commit is contained in:
Siana Gearz
2011-01-11 03:09:30 +01:00
parent 26a8ffb536
commit 6c37a5c514
15 changed files with 254 additions and 921 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
indra/newview/llfolderview.h
View File

@@ -167,14 +167,7 @@ public:
class LLInventoryFilter
{
public:
//fix to get rid of gSavedSettings use - rkeast
void setPartialSearch(bool toggle);
bool getPartialSearch();
void setSearchType(U32 type);
U32 getSearchType();
typedef enum e_folder_show
{
SHOW_ALL_FOLDERS,
@@ -254,10 +247,6 @@ public:
void fromLLSD(LLSD& data);
protected:
//fix to get rid of gSavedSettings use - rkeast
U32 mSearchType;
bool mPartialSearch;
struct filter_ops
{
U32 mFilterTypes;
@@ -332,10 +321,12 @@ class LLFolderView;
class LLFolderViewItem : public LLUICtrl
{
protected:
friend class LLFolderViewEventListener;
private:
BOOL mIsSelected;
protected:
static const LLFontGL* sFont;
static const LLFontGL* sSmallFont;
static LLColor4 sFgColor;
@@ -350,21 +341,14 @@ 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 mSearchableLabelCreator;
std::string mSearchable;
std::string mType;
S32 mLabelWidth;
U32 mCreationDate;
LLFolderViewFolder* mParentFolder;
LLFolderViewEventListener* mListener;
BOOL mIsSelected;
BOOL mIsCurSelection;
BOOL mSelectPending;
LLFontGL::StyleFlags mLabelStyle;
@@ -373,7 +357,6 @@ protected:
std::string mStatusText;
BOOL mHasVisibleChildren;
S32 mIndentation;
S32 mNumDescendantsSelected;
BOOL mFiltered;
S32 mLastFilterGeneration;
std::string::size_type mStringMatchOffset;
@@ -438,18 +421,13 @@ public:
// Returns TRUE if this item ends up being selected.
virtual BOOL setSelection(LLFolderViewItem* selection, BOOL openitem, BOOL take_keyboard_focus);
// This method is used to set the selection state of an item.
// If 'selection' is 'this' then note selection.
// Returns TRUE if the selection state of this item was changed.
virtual BOOL changeSelection(LLFolderViewItem* selection, BOOL selected);
// this method is used to group select items
virtual S32 extendSelection(LLFolderViewItem* selection, LLFolderViewItem* last_selected, LLDynamicArray<LLFolderViewItem*>& items){ return FALSE; }
// this method is used to group select items
virtual void recursiveDeselect(BOOL deselect_self);
virtual void extendSelection(LLFolderViewItem* selection, LLFolderViewItem* last_selected, LLDynamicArray<LLFolderViewItem*>& items) { }
// this method is used to deselect this element
void deselectItem();
@@ -469,8 +447,6 @@ public:
// destroys this item recursively
virtual void destroyView();
S32 getNumSelectedDescendants() { return mNumDescendantsSelected; }
BOOL isSelected() const { return mIsSelected; }
void setIsCurSelection(BOOL select) { mIsCurSelection = select; }
@@ -491,7 +467,7 @@ public:
// viewed. This method will ask the viewed object itself.
const std::string& getName( void ) const;
const std::string& getSearchableLabel() const;
std::string& getSearchableLabel( void );
// This method returns the label displayed on the view. This
// method was primarily added to allow sorting on the folder
@@ -579,7 +555,7 @@ public:
UNKNOWN, TRASH, NOT_TRASH
} ETrash;
private:
S32 mNumDescendantsSelected;
public: // Accessed needed by LLFolderViewItem
@@ -659,10 +635,10 @@ public:
virtual BOOL changeSelection(LLFolderViewItem* selection, BOOL selected);
// this method is used to group select items
virtual S32 extendSelection(LLFolderViewItem* selection, LLFolderViewItem* last_selected, LLDynamicArray<LLFolderViewItem*>& items);
virtual void extendSelection(LLFolderViewItem* selection, LLFolderViewItem* last_selected, LLDynamicArray<LLFolderViewItem*>& items);
// Deselect this folder and all folder/items it contains recursively.
virtual void recursiveDeselect(BOOL deselect_self);
void recursiveDeselect(BOOL deselect_self);
// Returns true is this object and all of its children can be removed.
virtual BOOL isRemovable();
@@ -826,7 +802,7 @@ public:
// children, and keeps track of selected objects.
virtual BOOL changeSelection(LLFolderViewItem* selection, BOOL selected);
virtual S32 extendSelection(LLFolderViewItem* selection, LLFolderViewItem* last_selected, LLDynamicArray<LLFolderViewItem*>& items);
virtual void extendSelection(LLFolderViewItem* selection, LLFolderViewItem* last_selected, LLDynamicArray<LLFolderViewItem*>& items);
virtual BOOL getSelectionList(std::set<LLUUID> &selection);
@@ -894,7 +870,7 @@ public:
/*virtual*/ void onFocusLost();
virtual BOOL handleScrollWheel(S32 x, S32 y, S32 clicks);
virtual void draw();
virtual void deleteAllChildren(BOOL delayed_delete=FALSE);
virtual void deleteAllChildren();
void scrollToShowSelection();
void scrollToShowItem(LLFolderViewItem* item);