livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIRE-30654 Make sure that LSL Bridge won't ask for OpenCollar in public channel, for whatever reason 

Newest state/channel will be applied anyway after returning region URL to the viewer
master
PanteraPolnocy 2021-02-06 02:05:22 +01:00
parent fcb7c25ce8
commit 14d152baab
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
indra/newview/fs_resources/EBEDD1D2-A320-43f5-88CF-DD47BBCA5DFB.lsltxt
View File

@ -7,7 +7,7 @@
//
// Bridge platform
string BRIDGE_VERSION = "2.25"; // This should match fslslbridge.cpp
string BRIDGE_VERSION = "2.26"; // This should match fslslbridge.cpp
string gLatestURL;
integer gViewerIsFirestorm;
integer gTryHandshakeOnce = TRUE;
@ -85,8 +85,11 @@
{
if (gAO_EnabledOC)
{
aoListenOC(NULL_KEY, TRUE);
llWhisper(gAO_ChannelOC, "OpenCollar?");
if (gAO_ChannelOC != PUBLIC_CHANNEL)
{
aoListenOC(NULL_KEY, TRUE);
llWhisper(gAO_ChannelOC, "OpenCollar?");
}
}
else
{

2
indra/newview/fslslbridge.cpp
View File

@ -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 = 25;
static const U32 FS_BRIDGE_MINOR_VERSION = 26;
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=";