SL-19379 build fix
parent
1eab324711
commit
19e9b5d488
|
|
@ -116,7 +116,7 @@ LLPanelMainInventory::LLPanelMainInventory(const LLPanel::Params& p)
|
|||
mNeedUploadCost(true),
|
||||
mMenuViewDefault(NULL),
|
||||
mSingleFolderMode(false),
|
||||
mViewMode(VIEW_LIST),
|
||||
mViewMode(MODE_LIST),
|
||||
mListViewRootUpdatedConnection(),
|
||||
mGalleryRootUpdatedConnection()
|
||||
{
|
||||
|
|
@ -1689,11 +1689,11 @@ void LLPanelMainInventory::onCustomAction(const LLSD& userdata)
|
|||
|
||||
if (command_name == "list_view")
|
||||
{
|
||||
setViewMode(VIEW_LIST);
|
||||
setViewMode(MODE_LIST);
|
||||
}
|
||||
if (command_name == "gallery_view")
|
||||
{
|
||||
setViewMode(VIEW_GALLERY);
|
||||
setViewMode(MODE_GALLERY);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -68,9 +68,9 @@ public:
|
|||
|
||||
enum EViewModeType
|
||||
{
|
||||
VIEW_LIST,
|
||||
VIEW_GALLERY,
|
||||
VIEW_COMBINATION
|
||||
MODE_LIST,
|
||||
MODE_GALLERY,
|
||||
MODE_COMBINATION
|
||||
};
|
||||
|
||||
virtual BOOL handleKeyHere(KEY key, MASK mask);
|
||||
|
|
@ -117,8 +117,8 @@ public:
|
|||
bool isSingleFolderMode() { return mSingleFolderMode; }
|
||||
|
||||
void setViewMode(EViewModeType mode);
|
||||
bool isListViewMode() { return (mViewMode == VIEW_LIST); }
|
||||
bool isGalleryViewMode() { return (mViewMode == VIEW_GALLERY); }
|
||||
bool isListViewMode() { return (mViewMode == MODE_LIST); }
|
||||
bool isGalleryViewMode() { return (mViewMode == MODE_GALLERY); }
|
||||
LLUUID getCurrentSFVRoot();
|
||||
|
||||
protected:
|
||||
|
|
|
|||
Loading…
Reference in New Issue