Second Life viewer sources 1.15.0.2

1 files changed, 45 insertions, 0 deletions

diff --git a/linden/indra/newview/llfloatermap.cpp b/linden/indra/newview/llfloatermap.cpp
index 2d549db..97d0041 100644
--- a/linden/indra/newview/llfloatermap.cpp
+++ b/linden/indra/newview/llfloatermap.cpp
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
+ * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
  * to you under the terms of the GNU General Public License, version 2.0
  * ("GPL"), unless you have obtained a separate licensing agreement
@@ -216,3 +217,47 @@ void LLFloaterMap::toggle(void*)
                 }
         }
 }
+
+
+BOOL process_secondlife_url(LLString url)
+{
+        S32 strpos, strpos2;
+
+        LLString slurlID = "slurl.com/secondlife/";
+        strpos = url.find(slurlID);
+        
+        if (strpos < 0)
+        {
+                slurlID="secondlife://";
+                strpos = url.find(slurlID);
+        }
+        
+        if (strpos >= 0) 
+        {
+                LLString simname;
+
+                strpos+=slurlID.length();
+                strpos2=url.find("/",strpos);
+                if (strpos2 < strpos) strpos2=url.length();
+                simname="secondlife://" + url.substr(strpos,url.length() - strpos);
+
+                LLURLSimString::setString( simname );
+                LLURLSimString::parse();
+
+                // if there is a world map
+                if ( gFloaterWorldMap )
+                {
+                        // mark where the destination is
+                        gFloaterWorldMap->trackURL( LLURLSimString::sInstance.mSimName.c_str(),
+                                                                                LLURLSimString::sInstance.mX,
+                                                                                LLURLSimString::sInstance.mY,
+                                                                                LLURLSimString::sInstance.mZ );
+
+                        // display map
+                        LLFloaterWorldMap::show( NULL, TRUE );
+                };
+
+                return TRUE;
+        }
+        return FALSE;
+}