diff options
| author | Eric M. Tulla (BigPapi) <tulla@lindenlab.com> | 2009-11-16 16:23:32 -0500 |
|---|---|---|
| committer | Eric M. Tulla (BigPapi) <tulla@lindenlab.com> | 2009-11-16 16:23:32 -0500 |
| commit | c4b65b6f93738a7658d7eb5b7647c74efed87efc (patch) | |
| tree | 24b6e02653786d9be7f0c97c3a02950c383d6f48 | |
| parent | 9d6816a61302bddfe63284c141391c6580d8ea38 (diff) | |
| parent | 19267a29c91b4b7e800df1a62af2e77a8d6b9214 (diff) | |
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
| -rw-r--r-- | indra/newview/llfolderview.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/indra/newview/llfolderview.cpp b/indra/newview/llfolderview.cpp index 21458f83cd..4192c6a586 100644 --- a/indra/newview/llfolderview.cpp +++ b/indra/newview/llfolderview.cpp @@ -909,11 +909,7 @@ void LLFolderView::finishRenamingItem( void ) mRenameItem->rename( mRenamer->getText() ); } - mRenamer->setCommitOnFocusLost( FALSE ); - mRenamer->setFocus( FALSE ); - mRenamer->setVisible( FALSE ); - mRenamer->setCommitOnFocusLost( TRUE ); - gFocusMgr.setTopCtrl( NULL ); + gFocusMgr.setTopCtrl( NULL ); if( mRenameItem ) { |