summaryrefslogtreecommitdiff
path: root/indra/newview/llfolderview.h
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llfolderview.h')
-rw-r--r--indra/newview/llfolderview.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/indra/newview/llfolderview.h b/indra/newview/llfolderview.h
index 37005f080f..9b8a629387 100644
--- a/indra/newview/llfolderview.h
+++ b/indra/newview/llfolderview.h
@@ -111,7 +111,7 @@ public:
virtual LLFolderView* getRoot() { return this; }
- LLFolderViewModelInterface* getViewModel() { return mViewModel; }
+ LLFolderViewModelInterface* getFolderViewModel() { return mViewModel; }
void setFilterPermMask(PermissionMask filter_perm_mask);
@@ -272,8 +272,6 @@ protected:
void onItemsRemovalConfirmation(const LLSD& notification, const LLSD& response);
- LLInventorySort& getSortFunction() { return mSortFunction; }
-
protected:
LLHandle<LLView> mPopupMenuHandle;
@@ -318,7 +316,6 @@ protected:
LLPanel* mParentPanel;
- LLInventorySort mSortFunction;
LLFolderViewModelInterface* mViewModel;
/**