From 64d9e73257efd89822435285626d8a5505627778 Mon Sep 17 00:00:00 2001
From: Andrew Dyukov <adyukov@productengine.com>
Date: Fri, 15 Jan 2010 22:02:42 +0200
Subject: Fixed major bug EXT-4308 ({Win7} Viewer crashes if drag-and-drop
 landmark from 'Places Task Panel ->My Landmarks' to 'Favorites Bar').

--HG--
branch : product-engine
---
 indra/newview/llfavoritesbar.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/indra/newview/llfavoritesbar.cpp b/indra/newview/llfavoritesbar.cpp
index fd6a92c47a..fb94657278 100644
--- a/indra/newview/llfavoritesbar.cpp
+++ b/indra/newview/llfavoritesbar.cpp
@@ -483,6 +483,10 @@ BOOL LLFavoritesBarCtrl::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
 
 				if (drop)
 				{
+					if (mItems.empty())
+					{
+						setLandingTab(NULL);
+					}
 					handleNewFavoriteDragAndDrop(item, favorites_id, x, y);
 					showDragMarker(FALSE);
 				}
-- 
cgit v1.2.3