Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/

1 files changed, 125 insertions, 0 deletions

diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index ddaf4a221c..45e153049b 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -51,6 +51,7 @@
 
 #include "llviewquery.h"
 #include "llxmltree.h"
+#include "llslurl.h"
 //#include "llviewercamera.h"
 #include "llrender.h"
 
@@ -80,6 +81,9 @@
 #include "timing.h"
 #include "llviewermenu.h"
 #include "lltooltip.h"
+#include "llmediaentry.h"
+#include "llurldispatcher.h"
+#include "llurlsimstring.h"
 
 // newview includes
 #include "llagent.h"
@@ -799,6 +803,127 @@ BOOL LLViewerWindow::handleMiddleMouseDown(LLWindow *window,  LLCoordGL pos, MAS
   	// Always handled as far as the OS is concerned.
 	return TRUE;
 }
+
+LLWindowCallbacks::DragNDropResult LLViewerWindow::handleDragNDrop( LLWindow *window, LLCoordGL pos, MASK mask, LLWindowCallbacks::DragNDropAction action, std::string data)
+{
+	LLWindowCallbacks::DragNDropResult result = LLWindowCallbacks::DND_NONE;
+
+	if (gSavedSettings.getBOOL("PrimMediaDragNDrop"))
+	{
+		switch(action)
+		{
+			// 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);
+					
+				// special case SLURLs
+				if ( LLSLURL::isSLURL( data ) )
+				{
+					if (drop)
+					{
+						LLURLDispatcher::dispatch( data, NULL, true );
+						LLURLSimString::setString( LLSLURL::stripProtocol( data ) );
+						LLPanelLogin::refreshLocation( true );
+						LLPanelLogin::updateLocationUI();
+					}
+					return LLWindowCallbacks::DND_MOVE;
+				};
+
+				LLPickInfo pick_info = pickImmediate( pos.mX, pos.mY,  TRUE /*BOOL pick_transparent*/ );
+
+				LLUUID object_id = pick_info.getObjectID();
+				S32 object_face = pick_info.mObjectFace;
+				std::string url = data;
+
+				lldebugs << "Object: picked at " << pos.mX << ", " << pos.mY << " - face = " << object_face << " - URL = " << url << llendl;
+
+				LLVOVolume *obj = dynamic_cast<LLVOVolume*>(static_cast<LLViewerObject*>(pick_info.getObject()));
+				
+				if (obj && obj->permModify() && !obj->getRegion()->getCapability("ObjectMedia").empty())
+				{
+					LLTextureEntry *te = obj->getTE(object_face);
+					if (te)
+					{
+						if (drop)
+						{
+							if (! te->hasMedia())
+							{
+								// Create new media entry
+								LLSD media_data;
+								// XXX Should we really do Home URL too?
+								media_data[LLMediaEntry::HOME_URL_KEY] = url;
+								media_data[LLMediaEntry::CURRENT_URL_KEY] = url;
+								media_data[LLMediaEntry::AUTO_PLAY_KEY] = true;
+								obj->syncMediaData(object_face, media_data, true, true);
+								// XXX This shouldn't be necessary, should it ?!?
+								if (obj->getMediaImpl(object_face))
+									obj->getMediaImpl(object_face)->navigateReload();
+								obj->sendMediaDataUpdate();
+								
+								result = LLWindowCallbacks::DND_COPY;
+							}
+							else {
+								// Check the whitelist
+								if (te->getMediaData()->checkCandidateUrl(url))
+								{
+									// just navigate to the URL
+									if (obj->getMediaImpl(object_face))
+									{
+										obj->getMediaImpl(object_face)->navigateTo(url);
+									}
+									else {
+										// This is very strange.  Navigation should
+										// happen via the Impl, but we don't have one.
+										// This sends it to the server, which /should/
+										// trigger us getting it.  Hopefully.
+										LLSD media_data;
+										media_data[LLMediaEntry::CURRENT_URL_KEY] = url;
+										obj->syncMediaData(object_face, media_data, true, true);
+										obj->sendMediaDataUpdate();
+									}
+									result = LLWindowCallbacks::DND_LINK;
+								}
+							}
+							LLSelectMgr::getInstance()->unhighlightObjectOnly(mDragHoveredObject);
+							mDragHoveredObject = NULL;
+							
+						}
+						else {
+							// Check the whitelist, if there's media (otherwise just show it)
+							if (te->getMediaData() == NULL || te->getMediaData()->checkCandidateUrl(url))
+							{
+								if ( obj != mDragHoveredObject)
+								{
+									// Highlight the dragged object
+									LLSelectMgr::getInstance()->unhighlightObjectOnly(mDragHoveredObject);
+									mDragHoveredObject = obj;
+									LLSelectMgr::getInstance()->highlightObjectOnly(mDragHoveredObject);
+								}
+								result = (! te->hasMedia()) ? LLWindowCallbacks::DND_COPY : LLWindowCallbacks::DND_LINK;
+							}
+						}
+					}
+				}
+			}
+			break;
+			
+			case LLWindowCallbacks::DNDA_STOP_TRACKING:
+				// The cleanup case below will make sure things are unhilighted if necessary.
+			break;
+		}
+
+		if (result == LLWindowCallbacks::DND_NONE && !mDragHoveredObject.isNull())
+		{
+			LLSelectMgr::getInstance()->unhighlightObjectOnly(mDragHoveredObject);
+			mDragHoveredObject = NULL;
+		}
+	}
+	
+	return result;
+}
   
 BOOL LLViewerWindow::handleMiddleMouseUp(LLWindow *window,  LLCoordGL pos, MASK mask)
 {