Commits

richard_linden committed 2163410

EXP-1160 FIX Cannot drag/drop items from inventory into the contents of a prim in latest Mesh build 239475
brought back some old logic for dispatching to child folder as drag and drop fallback

  • Participants
  • Parent commits 42784bf

Comments (0)

Files changed (1)

indra/newview/llfolderview.cpp

 
 	// when drop is not handled by child, it should be handled
 	// by the folder which is the hierarchy root.
-	if (!handled && getListener()->getUUID().notNull())
+	if (!handled)
 	{
-		LLFolderViewFolder::handleDragAndDrop(x, y, mask, drop, cargo_type, cargo_data, accept, tooltip_msg);
+		if (getListener()->getUUID().notNull())
+		{
+			LLFolderViewFolder::handleDragAndDrop(x, y, mask, drop, cargo_type, cargo_data, accept, tooltip_msg);
+		}
+		else
+		{
+			if (!mFolders.empty())
+			{
+				// dispatch to last folder as a hack to support "Contents" folder in object inventory
+				handled = mFolders.back()->handleDragAndDropFromChild(mask,drop,cargo_type,cargo_data,accept,tooltip_msg);
+			}
+		}
 	}
 
 	if (handled)