diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-06-16 11:42:37 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-06-16 11:42:37 -0400 |
| commit | e15002a11cf5081e0697065cb017ba0af6c4b32d (patch) | |
| tree | d60ac6d3a85d114b7860e42be5d9ff3338a6a169 /indra/llui/llfolderview.cpp | |
| parent | 78be5c3aa5f7263698bec5bcbccb24c150f78d09 (diff) | |
| parent | 977476171ddcc057d7c28b6c14ae988b8189ed75 (diff) | |
merge changes for 3.7.9-release
Diffstat (limited to 'indra/llui/llfolderview.cpp')
| -rwxr-xr-x | indra/llui/llfolderview.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/llui/llfolderview.cpp b/indra/llui/llfolderview.cpp index b92e298348..bc2388dd28 100755 --- a/indra/llui/llfolderview.cpp +++ b/indra/llui/llfolderview.cpp @@ -227,10 +227,11 @@ LLFolderView::LLFolderView(const Params& p) mStatusTextBox = LLUICtrlFactory::create<LLTextBox> (text_p); mStatusTextBox->setFollowsLeft(); mStatusTextBox->setFollowsTop(); - //addChild(mStatusTextBox); + addChild(mStatusTextBox); // make the popup menu available + llassert(LLMenuGL::sMenuContainer != NULL); LLMenuGL* menu = LLUICtrlFactory::getInstance()->createFromFile<LLMenuGL>(p.options_menu, LLMenuGL::sMenuContainer, LLMenuHolderGL::child_registry_t::instance()); if (!menu) { @@ -703,8 +704,9 @@ void LLFolderView::finishRenamingItem( void ) closeRenamer(); + // This is moved to an inventory observer in llinventorybridge.cpp, to handle updating after operation completed in AISv3 (SH-4611). // List is re-sorted alphabetically, so scroll to make sure the selected item is visible. - scrollToShowSelection(); + //scrollToShowSelection(); } void LLFolderView::closeRenamer( void ) |