summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/app_settings/settings.xml2
-rw-r--r--indra/newview/llfloaterdestinations.cpp2
-rw-r--r--indra/newview/skins/default/xui/en/floater_destinations.xml12
3 files changed, 7 insertions, 9 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index ad307f9648..1a4f443d94 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -2478,7 +2478,7 @@
<key>Type</key>
<string>String</string>
<key>Value</key>
- <string>https://lecs-viewer-web-components.s3.amazonaws.com/v3.0/[GRID_LOWERCASE]/guide.html</string>
+ <string>https://secondlife.com/destinations/whats-hot-now?ctx=viewer</string>
</map>
<key>DisableCameraConstraints</key>
<map>
diff --git a/indra/newview/llfloaterdestinations.cpp b/indra/newview/llfloaterdestinations.cpp
index 84fc4afcdd..b8090ce7c2 100644
--- a/indra/newview/llfloaterdestinations.cpp
+++ b/indra/newview/llfloaterdestinations.cpp
@@ -45,11 +45,9 @@ LLFloaterDestinations::~LLFloaterDestinations()
bool LLFloaterDestinations::postBuild()
{
- enableResizeCtrls(true, true, false);
LLMediaCtrl* destinations = getChild<LLMediaCtrl>("destination_guide_contents");
destinations->setErrorPageURL(gSavedSettings.getString("GenericErrorPageURL"));
std::string url = gSavedSettings.getString("DestinationGuideURL");
- url = LLWeb::expandURLSubstitutions(url, LLSD());
destinations->navigateTo(url, HTTP_CONTENT_TEXT_HTML);
// If cookie is there, will set it now. Otherwise will have to wait for login completion
diff --git a/indra/newview/skins/default/xui/en/floater_destinations.xml b/indra/newview/skins/default/xui/en/floater_destinations.xml
index 58dc6741b2..a5bc02936d 100644
--- a/indra/newview/skins/default/xui/en/floater_destinations.xml
+++ b/indra/newview/skins/default/xui/en/floater_destinations.xml
@@ -5,9 +5,9 @@
can_minimize="true"
can_close="true"
can_resize="true"
- min_height="230"
- min_width="350"
- height="230"
+ min_height="565"
+ min_width="530"
+ height="900"
layout="topleft"
name="Destinations"
single_instance="true"
@@ -15,11 +15,11 @@
save_rect="true"
save_visibility="true"
title="DESTINATIONS"
- width="550">
+ width="1080">
<web_browser
top="25"
- height="200"
- width="550"
+ height="875"
+ width="1080"
follows="all"
name="destination_guide_contents"
trusted_content="true"/>