Fix drag and drop for windows. Makes Win32 state machine behave more like Mac.

2 files changed, 2 insertions, 5 deletions

diff --git a/indra/llwindow/lldragdropwin32.cpp b/indra/llwindow/lldragdropwin32.cpp
index 4865570f07..1e10626e8a 100644
--- a/indra/llwindow/lldragdropwin32.cpp
+++ b/indra/llwindow/lldragdropwin32.cpp
@@ -189,7 +189,7 @@ class LLDragDropWin32Target:
 					MASK mask = gKeyboard->currentMask(TRUE);

 

 					LLWindowCallbacks::DragNDropResult result = window_imp->completeDragNDropRequest( gl_coord, mask, 

-						LLWindowCallbacks::DNDA_TRACK, std::string( "" ) );

+						LLWindowCallbacks::DNDA_TRACK, mDropUrl );

 					

 					switch (result)

 					{

diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index 02b8158188..81fcfc13c2 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -835,6 +835,7 @@ LLWindowCallbacks::DragNDropResult LLViewerWindow::handleDragNDrop( LLWindow *wi
 			// Much of the handling for these two cases is the same.
 			case LLWindowCallbacks::DNDA_TRACK:
 			case LLWindowCallbacks::DNDA_DROPPED:
+			case LLWindowCallbacks::DNDA_START_TRACKING:
 			{
 				bool drop = (LLWindowCallbacks::DNDA_DROPPED == action);
 					
@@ -925,10 +926,6 @@ LLWindowCallbacks::DragNDropResult LLViewerWindow::handleDragNDrop( LLWindow *wi
 			}
 			break;
 			
-			case LLWindowCallbacks::DNDA_START_TRACKING:
-				// No special handling here yet -- we'll actually start tracking on the first DNDA_TRACK event.
-			break;
-			
 			case LLWindowCallbacks::DNDA_STOP_TRACKING:
 				// The cleanup case below will make sure things are unhilighted if necessary.
 			break;