MAINT-1513 FIXED Label of new folder doesn't disappear while closing Inventory by hot hey
parent
b2fd397818
commit
eae82c8e47
|
|
@ -242,6 +242,8 @@ public:
|
|||
bool useLabelSuffix() { return mUseLabelSuffix; }
|
||||
virtual void updateMenu();
|
||||
|
||||
void finishRenamingItem( void );
|
||||
|
||||
// Note: We may eventually have to move that method up the hierarchy to LLFolderViewItem.
|
||||
LLHandle<LLFolderView> getHandle() const { return getDerivedHandle<LLFolderView>(); }
|
||||
|
||||
|
|
@ -255,7 +257,6 @@ protected:
|
|||
void commitRename( const LLSD& data );
|
||||
void onRenamerLost();
|
||||
|
||||
void finishRenamingItem( void );
|
||||
void closeRenamer( void );
|
||||
|
||||
bool selectFirstItem();
|
||||
|
|
|
|||
|
|
@ -1152,6 +1152,15 @@ void LLPanelMainInventory::onCustomAction(const LLSD& userdata)
|
|||
}
|
||||
}
|
||||
|
||||
void LLPanelMainInventory::onVisibilityChange( BOOL new_visibility )
|
||||
{
|
||||
if(!new_visibility)
|
||||
{
|
||||
mMenuAdd->setVisible(FALSE);
|
||||
getActivePanel()->getRootFolder()->finishRenamingItem();
|
||||
}
|
||||
}
|
||||
|
||||
bool LLPanelMainInventory::isSaveTextureEnabled(const LLSD& userdata)
|
||||
{
|
||||
LLFolderViewItem* current_item = getActivePanel()->getRootFolder()->getCurSelectedItem();
|
||||
|
|
|
|||
|
|
@ -72,6 +72,7 @@ public:
|
|||
std::string& tooltip_msg);
|
||||
/*virtual*/ void changed(U32);
|
||||
/*virtual*/ void draw();
|
||||
/*virtual*/ void onVisibilityChange ( BOOL new_visibility );
|
||||
|
||||
LLInventoryPanel* getPanel() { return mActivePanel; }
|
||||
LLInventoryPanel* getActivePanel() { return mActivePanel; }
|
||||
|
|
|
|||
Loading…
Reference in New Issue