1 files changed, 47 insertions, 21 deletions

diff --git a/linden/indra/newview/llurldispatcher.cpp b/linden/indra/newview/llurldispatcher.cpp
index c2c704d..78b305c 100644
--- a/linden/indra/newview/llurldispatcher.cpp
+++ b/linden/indra/newview/llurldispatcher.cpp
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -37,13 +37,13 @@
 #include "llcommandhandler.h"
 #include "llfloaterurldisplay.h"
 #include "llfloaterdirectory.h"
-#include "llfloaterhtmlhelp.h"
-//#include "llfloaterworldmap.h"
+#include "llfloaterhtml.h"
 #include "llfloaterworldmap.h"
 #include "llpanellogin.h"
 #include "llstartup.h"                  // gStartupState
 #include "llurlsimstring.h"
 #include "llviewerwindow.h"             // alertXml()
+#include "llweb.h"
 #include "llworldmap.h"
 
 // library includes
@@ -63,23 +63,24 @@ public:
 
         static bool isSLURLCommand(const std::string& url);
 
-        static bool dispatch(const std::string& url);
-                // returns true if handled
+        static bool dispatch(const std::string& url, bool from_external_browser);
+                // returns true if handled or explicitly blocked.
 
         static bool dispatchRightClick(const std::string& url);
 
 private:
-        static bool dispatchCore(const std::string& url, bool right_mouse);
+        static bool dispatchCore(const std::string& url, 
+                bool from_external_browser, bool right_mouse);
                 // handles both left and right click
 
         static bool dispatchHelp(const std::string& url, BOOL right_mouse);
                 // Handles sl://app.floater.html.help by showing Help floater.
                 // Returns true if handled.
 
-        static bool dispatchApp(const std::string& url, BOOL right_mouse);
-                // Handles secondlife://app/agent/<agent_id>/about and similar
+        static bool dispatchApp(const std::string& url, bool from_external_browser, BOOL right_mouse);
+                // Handles secondlife:///app/agent/<agent_id>/about and similar
                 // by showing panel in Search floater.
-                // Returns true if handled.
+                // Returns true if handled or explicitly blocked.
 
         static bool dispatchRegion(const std::string& url, BOOL right_mouse);
                 // handles secondlife://Ahern/123/45/67/
@@ -120,11 +121,11 @@ bool LLURLDispatcherImpl::isSLURLCommand(const std::string& url)
 }
 
 // static
-bool LLURLDispatcherImpl::dispatchCore(const std::string& url, bool right_mouse)
+bool LLURLDispatcherImpl::dispatchCore(const std::string& url, bool from_external_browser, bool right_mouse)
 {
         if (url.empty()) return false;
         if (dispatchHelp(url, right_mouse)) return true;
-        if (dispatchApp(url, right_mouse)) return true;
+        if (dispatchApp(url, from_external_browser, right_mouse)) return true;
         if (dispatchRegion(url, right_mouse)) return true;
 
         /*
@@ -138,17 +139,20 @@ bool LLURLDispatcherImpl::dispatchCore(const std::string& url, bool right_mouse)
 }
 
 // static
-bool LLURLDispatcherImpl::dispatch(const std::string& url)
+bool LLURLDispatcherImpl::dispatch(const std::string& url, bool from_external_browser)
 {
         llinfos << "url: " << url << llendl;
-        return dispatchCore(url, false);        // not right click
+        const bool right_click = false;
+        return dispatchCore(url, from_external_browser, right_click);
 }
 
 // static
 bool LLURLDispatcherImpl::dispatchRightClick(const std::string& url)
 {
         llinfos << "url: " << url << llendl;
-        return dispatchCore(url, true); // yes right click
+        const bool from_external_browser = false;
+        const bool right_click = true;
+        return dispatchCore(url, from_external_browser, right_click);
 }
 // static
 bool LLURLDispatcherImpl::dispatchHelp(const std::string& url, BOOL right_mouse)
@@ -164,7 +168,9 @@ bool LLURLDispatcherImpl::dispatchHelp(const std::string& url, BOOL right_mouse)
 }
 
 // static
-bool LLURLDispatcherImpl::dispatchApp(const std::string& url, BOOL right_mouse)
+bool LLURLDispatcherImpl::dispatchApp(const std::string& url, 
+                                                                          bool from_external_browser,
+                                                                          BOOL right_mouse)
 {
         if (!isSLURL(url))
         {
@@ -176,7 +182,8 @@ bool LLURLDispatcherImpl::dispatchApp(const std::string& url, BOOL right_mouse)
         pathArray.erase(0); // erase "app"
         std::string cmd = pathArray.get(0);
         pathArray.erase(0); // erase "cmd"
-        bool handled = LLCommandDispatcher::dispatch(cmd, pathArray, uri.queryMap());
+        bool handled = LLCommandDispatcher::dispatch(
+                        cmd, from_external_browser, pathArray, uri.queryMap());
         return handled;
 }
 
@@ -197,7 +204,8 @@ bool LLURLDispatcherImpl::dispatchRegion(const std::string& url, BOOL right_mous
                 LLURLSimString::setString(url);
                 // We're at the login screen, so make sure user can see
                 // the login location box to know where they are going.
-                LLPanelLogin::loadLoginPage();
+                
+                LLPanelLogin::refreshLocation( true );
                 return true;
         }
 
@@ -297,7 +305,9 @@ std::string LLURLDispatcherImpl::stripProtocol(const std::string& url)
 class LLTeleportHandler : public LLCommandHandler
 {
 public:
-        LLTeleportHandler() : LLCommandHandler("teleport") { }
+        // not allowed from outside the app
+        LLTeleportHandler() : LLCommandHandler("teleport", false) { }
+
         bool handle(const LLSD& tokens, const LLSD& queryMap)
         {
                 // construct a "normal" SLURL, resolve the region to
@@ -337,12 +347,28 @@ bool LLURLDispatcher::isSLURLCommand(const std::string& url)
 }
 
 // static
-bool LLURLDispatcher::dispatch(const std::string& url)
+bool LLURLDispatcher::dispatch(const std::string& url, bool from_external_browser)
 {
-        return LLURLDispatcherImpl::dispatch(url);
+        return LLURLDispatcherImpl::dispatch(url, from_external_browser);
 }
 // static
 bool LLURLDispatcher::dispatchRightClick(const std::string& url)
 {
         return LLURLDispatcherImpl::dispatchRightClick(url);
 }
+
+// static
+bool LLURLDispatcher::dispatchFromTextEditor(const std::string& url)
+{
+        // text editors are by definition internal to our code
+        const bool from_external_browser = false;
+        return LLURLDispatcherImpl::dispatch(url, from_external_browser);
+}
+
+// static
+std::string LLURLDispatcher::buildSLURL(const std::string& regionname, S32 x, S32 y, S32 z)
+{
+        std::string slurl = SLURL_SLURL_PREFIX + regionname + llformat("/%d/%d/%d",x,y,z); 
+        slurl = LLWeb::escapeURL( slurl );
+        return slurl;
+}