diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp
index 1d97e12d9f..c0b411e943 100755
--- a/indra/llui/llfloater.cpp
+++ b/indra/llui/llfloater.cpp
@@ -2953,14 +2953,9 @@ void LLFloaterView::adjustToFitScreen(LLFloater* floater, BOOL allow_partial_out
 		}
 	}
 
-	// <FS:Ansariel> Memory corruption crash at login/logout
-	//const LLRect& left_toolbar_rect = mToolbarRects[LLToolBarEnums::TOOLBAR_LEFT];
-	//const LLRect& bottom_toolbar_rect = mToolbarRects[LLToolBarEnums::TOOLBAR_BOTTOM];
-	//const LLRect& right_toolbar_rect = mToolbarRects[LLToolBarEnums::TOOLBAR_RIGHT];
-	const LLRect& left_toolbar_rect = mToolbarLeftRect;
-	const LLRect& bottom_toolbar_rect = mToolbarBottomRect;
-	const LLRect& right_toolbar_rect = mToolbarRightRect;
-	// </FS:Ansariel>
+	const LLRect& left_toolbar_rect = mToolbarRects[LLToolBarEnums::TOOLBAR_LEFT];
+	const LLRect& bottom_toolbar_rect = mToolbarRects[LLToolBarEnums::TOOLBAR_BOTTOM];
+	const LLRect& right_toolbar_rect = mToolbarRects[LLToolBarEnums::TOOLBAR_RIGHT];
 	const LLRect& floater_rect = floater->getRect();
 
 	S32 delta_left = left_toolbar_rect.notEmpty() ? left_toolbar_rect.mRight - floater_rect.mRight : 0;
@@ -3225,23 +3220,7 @@ void LLFloaterView::setToolbarRect(LLToolBarEnums::EToolBarLocation tb, const LL
 {
 	if (tb < LLToolBarEnums::TOOLBAR_COUNT)
 	{
-		// <FS:Ansariel> Memory corruption crash at login/logout
-		//mToolbarRects[tb] = toolbar_rect;
-		switch (tb)
-		{
-			case LLToolBarEnums::TOOLBAR_LEFT:
-				mToolbarLeftRect = toolbar_rect;
-				break;
-			case LLToolBarEnums::TOOLBAR_RIGHT:
-				mToolbarRightRect = toolbar_rect;
-				break;
-			case LLToolBarEnums::TOOLBAR_BOTTOM:
-				mToolbarBottomRect = toolbar_rect;
-				break;
-			default:
-				break;
-		}
-		// </FS:Ansariel>
+		mToolbarRects[tb] = toolbar_rect;
 	}
 }
 
diff --git a/indra/llui/llfloater.h b/indra/llui/llfloater.h
index 711297b88d..e623d4d2c0 100755
--- a/indra/llui/llfloater.h
+++ b/indra/llui/llfloater.h
@@ -595,12 +595,7 @@ private:
 	void hiddenFloaterClosed(LLFloater* floater);
 
 	LLRect				mLastSnapRect;
-	// <FS:Ansariel> Memory corruption crash at login/logout
-	//LLRect				mToolbarRects[LLToolBarEnums::TOOLBAR_COUNT];
-	LLRect			mToolbarLeftRect;
-	LLRect			mToolbarRightRect;
-	LLRect			mToolbarBottomRect;
-	// </FS:Ansariel>
+	LLRect				mToolbarRects[LLToolBarEnums::TOOLBAR_COUNT];
 	LLHandle<LLView>	mSnapView;
 	BOOL			mFocusCycleMode;
 	S32				mSnapOffsetBottom;
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index 14cc66780a..833ec98e68 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -1979,10 +1979,7 @@ void LLViewerWindow::initBase()
 
 	// Constrain floaters to inside the menu and status bar regions.
 	gFloaterView = main_view->getChild<LLFloaterView>("Floater View");
-	// <FS:Ansariel> Memory corruption crash at login/logout
-	//for (S32 i = 0; i < LLToolBarEnums::TOOLBAR_COUNT; ++i)
-	for (S32 i = LLToolBarEnums::TOOLBAR_FIRST; i <= LLToolBarEnums::TOOLBAR_LAST; ++i)
-	// </FS:Ansariel>
+	for (S32 i = 0; i < LLToolBarEnums::TOOLBAR_COUNT; ++i)
 	{
 		LLToolBar * toolbarp = gToolBarView->getToolbar((LLToolBarEnums::EToolBarLocation)i);
 		if (toolbarp)