summaryrefslogtreecommitdiff
path: root/indra/newview/llfolderview.h
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2010-09-20 17:24:33 -0700
committerMerov Linden <merov@lindenlab.com>2010-09-20 17:24:33 -0700
commit136029821ca37dbe7d7707a0fb0422612a31bae6 (patch)
tree6f8adb30c0f4cb4c5a96f2de0f7a1b7befa873d4 /indra/newview/llfolderview.h
parent85f69fbd8620c98f67a39e9ac09c9946c87251d8 (diff)
STORM-162 : Makes the folder code more resilient
Diffstat (limited to 'indra/newview/llfolderview.h')
-rw-r--r--indra/newview/llfolderview.h11
1 files changed, 5 insertions, 6 deletions
diff --git a/indra/newview/llfolderview.h b/indra/newview/llfolderview.h
index 980f9a34a6..f9c48c3ca7 100644
--- a/indra/newview/llfolderview.h
+++ b/indra/newview/llfolderview.h
@@ -74,7 +74,6 @@ public:
virtual void doItem(LLFolderViewItem* item) = 0;
};
-
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
// Class LLFolderView
//
@@ -146,18 +145,18 @@ public:
// Record the selected item and pass it down the hierachy.
virtual BOOL setSelection(LLFolderViewItem* selection, BOOL openitem,
BOOL take_keyboard_focus);
-
+
// Used by menu callbacks
void setSelectionByID(const LLUUID& obj_id, BOOL take_keyboard_focus);
-
+
// Called once a frame to update the selection if mSelectThisID has been set
- void updateSelection();
-
+ void updateSelection();
+
// This method is used to toggle the selection of an item. Walks
// 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 std::set<LLUUID> getSelectionList() const;