summaryrefslogtreecommitdiff
path: root/indra/newview/llplacesinventorypanel.cpp
diff options
context:
space:
mode:
authorDave SIMmONs <simon@lindenlab.com>2010-10-12 14:00:07 -0700
committerDave SIMmONs <simon@lindenlab.com>2010-10-12 14:00:07 -0700
commit683775aab87b815a09539ef621128f2e0007984e (patch)
tree6bf066c7db7504201fd610dbc4a4a933c60c22b7 /indra/newview/llplacesinventorypanel.cpp
parent58f0e78cb491833440d85e105593bccc2d2aa4ab (diff)
parenta8fbfa40ba6153668e1f713ae0e128224b4f400f (diff)
Merge latest from lindenlab/viewer-development
Diffstat (limited to 'indra/newview/llplacesinventorypanel.cpp')
-rw-r--r--indra/newview/llplacesinventorypanel.cpp18
1 files changed, 18 insertions, 0 deletions
diff --git a/indra/newview/llplacesinventorypanel.cpp b/indra/newview/llplacesinventorypanel.cpp
index 29e262199e..408270a1a0 100644
--- a/indra/newview/llplacesinventorypanel.cpp
+++ b/indra/newview/llplacesinventorypanel.cpp
@@ -205,6 +205,24 @@ BOOL LLPlacesFolderView::handleRightMouseDown(S32 x, S32 y, MASK mask)
return LLFolderView::handleRightMouseDown(x, y, mask);
}
+BOOL LLPlacesFolderView::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
+ EDragAndDropType cargo_type,
+ void* cargo_data,
+ EAcceptance* accept,
+ std::string& tooltip_msg)
+{
+ // Don't accept anything except landmarks and folders to be dropped
+ // in places folder view. See STORM-296.
+ if (cargo_type != DAD_LANDMARK && cargo_type != DAD_CATEGORY)
+ {
+ *accept = ACCEPT_NO;
+ return FALSE;
+ }
+
+ return LLFolderView::handleDragAndDrop(x, y, mask, drop, cargo_type, cargo_data,
+ accept, tooltip_msg);
+}
+
void LLPlacesFolderView::setupMenuHandle(LLInventoryType::EType asset_type, LLHandle<LLView> menu_handle)
{
mMenuHandlesByInventoryType[asset_type] = menu_handle;