Fixed #428: showcase tab shows 'all' web search in second life

2 files changed, 20 insertions, 1 deletions

diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 935d4b1..53a708e 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -723,6 +723,17 @@
     <key>Value</key>
     <integer>0</integer>
   </map>
+  <key>ShowcaseURLDefault</key>
+  <map>
+    <key>Comment</key>
+    <string>URL to load for the Showcase tab in Second Life</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>String</string>
+    <key>Value</key>
+    <string>http://secondlife.com/app/showcase/index.php?</string>
+  </map>
   <key>ShowAOSitPopup</key>
   <map>
     <key>Comment</key>
diff --git a/linden/indra/newview/llpaneldirfind.cpp b/linden/indra/newview/llpaneldirfind.cpp
index 4ad75fa..609f5cc 100644
--- a/linden/indra/newview/llpaneldirfind.cpp
+++ b/linden/indra/newview/llpaneldirfind.cpp
@@ -274,7 +274,15 @@ void LLPanelDirFind::navigateToDefaultPage()
         {
                 if (gHippoGridManager->getConnectedGrid()->isSecondLife()) 
                 {
-                        start_url = gSavedSettings.getString("SearchURLDefault");
+                        if (mBrowserName == "showcase_browser")
+                        {
+                                // note that the showcase URL in floater_directory.xml is no longer used
+                                start_url = gSavedSettings.getString("ShowcaseURLDefault");
+                        }
+                        else
+                        {
+                                start_url = gSavedSettings.getString("SearchURLDefault");
+                        }
                 }
                 else
                 {