Revert "SL-19795 Unified scroll"

2 files changed, 5 insertions, 12 deletions

diff --git a/indra/llui/llfolderview.cpp b/indra/llui/llfolderview.cpp
index f0106e345c..70c2a79d25 100644
--- a/indra/llui/llfolderview.cpp
+++ b/indra/llui/llfolderview.cpp
@@ -695,18 +695,11 @@ void LLFolderView::draw()
 		}
 	}
 
-	if (mRenameItem
-        && mRenamer
-        && mRenamer->getVisible())
+	if (mRenameItem && mRenamer && mRenamer->getVisible() && !getVisibleRect().overlaps(mRenamer->getRect()))
 	{
-        LLRect renamer_rect;
-        localRectToOtherView(mRenamer->getRect(), &renamer_rect, mScrollContainer);
-        if (!mScrollContainer->getRect().overlaps(renamer_rect))
-        {
-            // renamer is not connected to the item we are renaming in any form so manage it manually
-            // TODO: consider stopping on any scroll action instead of when out of visible area
-            finishRenamingItem();
-        }
+		// renamer is not connected to the item we are renaming in any form so manage it manually
+		// TODO: consider stopping on any scroll action instead of when out of visible area
+		finishRenamingItem();
 	}
 
 	// skip over LLFolderViewFolder::draw since we don't want the folder icon, label, 
diff --git a/indra/llui/llfolderview.h b/indra/llui/llfolderview.h
index ed84b29fd9..6de366044c 100644
--- a/indra/llui/llfolderview.h
+++ b/indra/llui/llfolderview.h
@@ -258,13 +258,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.