1 files changed, 1 insertions, 43 deletions
diff --git a/indra/llui/lltoolbarview.cpp b/indra/llui/lltoolbarview.cpp
index 0c3a6bd0ac..bb4ea815c9 100644
--- a/indra/llui/lltoolbarview.cpp
+++ b/indra/llui/lltoolbarview.cpp
@@ -55,10 +55,7 @@ LLToolBarView::LLToolBarView(const LLToolBarView::Params& p)
 :	LLUICtrl(p),
 	mToolbarLeft(NULL),
 	mToolbarRight(NULL),
-	mToolbarBottom(NULL),
-	mDragButton(NULL),
-	mMouseX(0),
-	mMouseY(0)
+	mToolbarBottom(NULL)
 {
 }
 
@@ -79,9 +76,6 @@ BOOL LLToolBarView::postBuild()
 	mToolbarRight  = getChild<LLToolBar>("toolbar_right");
 	mToolbarBottom = getChild<LLToolBar>("toolbar_bottom");
 
-	// Load the toolbars from the settings
-	loadToolbars();
-	
 	return TRUE;
 }
 
@@ -286,40 +280,4 @@ void LLToolBarView::draw()
 	//gl_rect_2d(right_rect, back_color_vert, TRUE);
 	
 	LLUICtrl::draw();
-
-	if (mDragButton)
-	{
-		S32 cursor_x, cursor_y;
-		mDragButton->setOrigin(mMouseX - mDragButton->getRect().getWidth(), mMouseY - mDragButton->getRect().getHeight());
-		drawChild(mDragButton);
-	}
-}
-
-void LLToolBarView::startDrag(LLToolBarButton* button)
-{
-	mDragButton = button;
-	addChild(mDragButton);
-	gFocusMgr.setMouseCapture(this);
-}
-
-BOOL LLToolBarView::handleHover(S32 x, S32 y, MASK mask)
-{
-	mMouseX = x;
-	mMouseY = y;
-	return LLUICtrl::handleHover(x, y, mask);
-}
-
-BOOL LLToolBarView::handleMouseUp(S32 x, S32 y, MASK mask)
-{
-	if (hasMouseCapture())
-	{
-		gFocusMgr.setMouseCapture(NULL);
-	}
-	return LLUICtrl::handleMouseUp(x, y, mask);
-}
-
-void LLToolBarView::onMouseCaptureLost()
-{
-	delete mDragButton;
-	mDragButton = NULL;
 }