diff options
| author | Tess Chu <tess@lindenlab.com> | 2007-11-20 02:53:43 +0000 |
|---|---|---|
| committer | Tess Chu <tess@lindenlab.com> | 2007-11-20 02:53:43 +0000 |
| commit | 2f6c7606241acdf800a2c079b359e7a1db360954 (patch) | |
| tree | adb6e6e34f9c3df1e2252b2f763ae20970c0e2d4 /indra/newview/llappviewermacosx.cpp | |
| parent | 813b140d0767146b17acf4ad2fb96fbd5a347c34 (diff) | |
svn merge -r 73926:74098 svn+ssh://svn/svn/linden/branches/viewer-auth-7
Diffstat (limited to 'indra/newview/llappviewermacosx.cpp')
| -rw-r--r-- | indra/newview/llappviewermacosx.cpp | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/indra/newview/llappviewermacosx.cpp b/indra/newview/llappviewermacosx.cpp index 63e7a6b129..e80491e786 100644 --- a/indra/newview/llappviewermacosx.cpp +++ b/indra/newview/llappviewermacosx.cpp @@ -42,6 +42,7 @@ #include "llmd5.h" #include "llurlsimstring.h" #include "llfloaterworldmap.h" +#include "llurldispatcher.h" #include <Carbon/Carbon.h> @@ -170,24 +171,8 @@ OSErr AEGURLHandler(const AppleEvent *messagein, AppleEvent *reply, long refIn) if(result == noErr) { - // Got the URL out of the event. - // secondlife:// - - // Parse it and stash in globals. - LLURLSimString::setString(buffer); - - if(gFloaterWorldMap != NULL) - { - // If the viewer's already logged in, pass it along directly. - if (LLURLSimString::parse()) - { - gFloaterWorldMap->trackURL(LLURLSimString::sInstance.mSimName, - LLURLSimString::sInstance.mX, - LLURLSimString::sInstance.mY, - LLURLSimString::sInstance.mZ); - LLFloaterWorldMap::show(NULL, TRUE); - } - } + std::string url = buffer; + LLURLDispatcher::dispatch(url); } return(result); |