From b63a4596f97d1af3e6b79a73d4ede05b35f20d5f Mon Sep 17 00:00:00 2001 From: PanteraPolnocy Date: Fri, 18 Mar 2022 14:59:55 +0100 Subject: [PATCH] Use HTTPS in the bridge by default --- .../EBEDD1D2-A320-43f5-88CF-DD47BBCA5DFB.lsltxt | 6 +++--- indra/newview/fslslbridge.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/indra/newview/fs_resources/EBEDD1D2-A320-43f5-88CF-DD47BBCA5DFB.lsltxt b/indra/newview/fs_resources/EBEDD1D2-A320-43f5-88CF-DD47BBCA5DFB.lsltxt index 11e5ee0ce5..9103d4faf3 100644 --- a/indra/newview/fs_resources/EBEDD1D2-A320-43f5-88CF-DD47BBCA5DFB.lsltxt +++ b/indra/newview/fs_resources/EBEDD1D2-A320-43f5-88CF-DD47BBCA5DFB.lsltxt @@ -7,7 +7,7 @@ // // Bridge platform - string BRIDGE_VERSION = "2.27"; // This should match fslslbridge.cpp + string BRIDGE_VERSION = "2.28"; // This should match fslslbridge.cpp string gLatestURL; integer gViewerIsFirestorm; integer gTryHandshakeOnce = TRUE; @@ -48,8 +48,8 @@ { llReleaseURL(gLatestURL); gLatestURL = ""; - // llRequestSecureURL(); // Uncomment this line and comment next one for HTTPS instead of HTTP (experimental) - llRequestURL(); + llRequestSecureURL(); + // llRequestURL(); -- Uncomment this line and comment the previous one for HTTP instead of HTTPS } detachBridge() diff --git a/indra/newview/fslslbridge.cpp b/indra/newview/fslslbridge.cpp index e8596296cb..2495242dd1 100644 --- a/indra/newview/fslslbridge.cpp +++ b/indra/newview/fslslbridge.cpp @@ -55,7 +55,7 @@ static const std::string FS_BRIDGE_FOLDER = "#LSL Bridge"; static const std::string FS_BRIDGE_CONTAINER_FOLDER = "Landscaping"; static const U32 FS_BRIDGE_MAJOR_VERSION = 2; -static const U32 FS_BRIDGE_MINOR_VERSION = 27; +static const U32 FS_BRIDGE_MINOR_VERSION = 28; static const U32 FS_MAX_MINOR_VERSION = 99; static const std::string UPLOAD_SCRIPT_CURRENT = "EBEDD1D2-A320-43f5-88CF-DD47BBCA5DFB.lsltxt"; static const std::string FS_STATE_ATTRIBUTE = "state=";