diff options
| author | Tess Chu <tess@lindenlab.com> | 2007-10-02 22:38:38 +0000 |
|---|---|---|
| committer | Tess Chu <tess@lindenlab.com> | 2007-10-02 22:38:38 +0000 |
| commit | cfd17f3322ec9c8efb120faa23adb83846272193 (patch) | |
| tree | eefbf2fefcac737d4050fba10e072fe951cd4381 /indra/newview/llviewerwindow.cpp | |
| parent | 97631054272eeb83155f70fec6a869efc39079e5 (diff) | |
svn merge -r 70819:70853 svn+ssh://svn/svn/linden/branches/urldispatcher-for-merge
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
| -rw-r--r-- | indra/newview/llviewerwindow.cpp | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index 897831afc0..d4b87ceba0 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -136,6 +136,7 @@ #include "lltoolview.h" #include "llvieweruictrlfactory.h" #include "lluploaddialog.h" +#include "llurldispatcher.h" // SLURL from other app instance #include "llviewercamera.h" #include "llviewergesture.h" #include "llviewerimagelist.h" @@ -1394,22 +1395,14 @@ void LLViewerWindow::handleWindowUnblock(LLWindow *window) void LLViewerWindow::handleDataCopy(LLWindow *window, S32 data_type, void *data) { + const S32 SLURL_MESSAGE_TYPE = 0; switch (data_type) { - case 0: + case SLURL_MESSAGE_TYPE: // received URL - if (LLURLSimString::unpack_data(data)) + std::string url = (const char*)data; + if (LLURLDispatcher::dispatch(url)) { - if(gFloaterWorldMap) - { - gFloaterWorldMap->trackURL(LLURLSimString::sInstance.mSimName, - LLURLSimString::sInstance.mX, - LLURLSimString::sInstance.mY, - LLURLSimString::sInstance.mZ); - - LLFloaterWorldMap::show(NULL, TRUE); - } - // bring window to foreground, as it has just been "launched" from a URL mWindow->bringToFront(); } |