diff options
| author | callum <none@none> | 2009-11-30 20:19:39 -0800 |
|---|---|---|
| committer | callum <none@none> | 2009-11-30 20:19:39 -0800 |
| commit | e0a7b7608f087b7d3a4b91ba7868e0a5c04aaa86 (patch) | |
| tree | a4f225f5bb94495cd794d2f16d019b738de7baee /indra/newview/llviewerwindow.cpp | |
| parent | aae1917d2e7a5af03f525d44eb177317495ead29 (diff) | |
Add support for dropping a region SLURL on login page and populating the UI
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
| -rw-r--r-- | indra/newview/llviewerwindow.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index f953a45890..31b30344be 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -50,6 +50,7 @@ #include "llviewquery.h" #include "llxmltree.h" +#include "llslurl.h" //#include "llviewercamera.h" #include "llrender.h" @@ -828,9 +829,12 @@ BOOL LLViewerWindow::handleDragNDrop( LLWindow *window, LLCoordGL pos, MASK mas if (gSavedSettings.getBOOL("PrimMediaDragNDrop")) { // special case SLURLs - if ( slurl ) + if ( drop && slurl ) { LLURLDispatcher::dispatch( data, NULL, true ); + LLURLSimString::setString( LLSLURL::stripProtocol( data ) ); + LLPanelLogin::refreshLocation( true ); + LLPanelLogin::updateLocationUI(); return TRUE; }; |