summaryrefslogtreecommitdiff
path: root/indra/newview/llfavoritesbar.cpp
diff options
context:
space:
mode:
authorAndrew Dyukov <adyukov@productengine.com>2010-01-15 22:02:42 +0200
committerAndrew Dyukov <adyukov@productengine.com>2010-01-15 22:02:42 +0200
commit64d9e73257efd89822435285626d8a5505627778 (patch)
tree04bb792eee6939022f255f5b372233397c6e61c9 /indra/newview/llfavoritesbar.cpp
parent2b5f45c1aabb87c23695e85d8b26cde55c94ba3f (diff)
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
Diffstat (limited to 'indra/newview/llfavoritesbar.cpp')
-rw-r--r--indra/newview/llfavoritesbar.cpp4
1 files changed, 4 insertions, 0 deletions
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);
}