diff options
| -rw-r--r-- | indra/llui/llfolderview.h | 2 | ||||
| -rw-r--r-- | indra/newview/llpanelmaininventory.cpp | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/indra/llui/llfolderview.h b/indra/llui/llfolderview.h index f19df1d0dc..22b8c475ec 100644 --- a/indra/llui/llfolderview.h +++ b/indra/llui/llfolderview.h @@ -255,13 +255,13 @@ public: virtual void updateMenu(); void finishRenamingItem( void ); + void updateRenamerPosition(); // Note: We may eventually have to move that method up the hierarchy to LLFolderViewItem. LLHandle<LLFolderView> getHandle() const { return getDerivedHandle<LLFolderView>(); } private: void updateMenuOptions(LLMenuGL* menu); - void updateRenamerPosition(); protected: LLScrollContainer* mScrollContainer; // NULL if this is not a child of a scroll container. diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp index c57ff26b91..06b71d0f7a 100644 --- a/indra/newview/llpanelmaininventory.cpp +++ b/indra/newview/llpanelmaininventory.cpp @@ -2357,6 +2357,12 @@ void LLPanelMainInventory::updateCombinationVisibility() { scrollToInvPanelSelection(); } + + LLFolderView* root_folder = mCombinationInventoryPanel->getRootFolder(); + if (root_folder) + { + root_folder->updateRenamerPosition(); + } } } |