diff --git a/indra/copy_win_scripts/start-client.py b/indra/copy_win_scripts/start-client.py index 172cbe9b..a91b7f2f 100755 --- a/indra/copy_win_scripts/start-client.py +++ b/indra/copy_win_scripts/start-client.py @@ -56,7 +56,7 @@ def start_client(grid, slurl, build_config, my_args): f = open("start-client.log", "w") print("Viewer startup arguments:", file=f) llstart.start("viewer", "../../newview", - "%s/newview/%s/firestorm-bin.exe" % (build_path, build_config), + "%s/newview/%s/puma-bin.exe" % (build_path, build_config), viewer_args, f) f.close() diff --git a/indra/lib/python/indra/util/llmanifest.py b/indra/lib/python/indra/util/llmanifest.py index d1a2f9af..b5278af7 100755 --- a/indra/lib/python/indra/util/llmanifest.py +++ b/indra/lib/python/indra/util/llmanifest.py @@ -94,7 +94,7 @@ def get_default_platform(dummy): }[sys.platform] DEFAULT_SRCTREE = os.path.dirname(sys.argv[0]) -CHANNEL_VENDOR_BASE = 'Firestorm' +CHANNEL_VENDOR_BASE = 'Puma' RELEASE_CHANNEL = CHANNEL_VENDOR_BASE + ' Development' BASE_ARGUMENTS=[ @@ -232,7 +232,7 @@ def main(extra=[]): args['version'] = vf.read().strip().split('.') except: print("Unable to read versionfile '%s'" % args['versionfile']) - # This will break copy_w_viewer_manifest on Windows 32 and 64 bit builds, the versionfile will not create until the firestorm project. + # This will break copy_w_viewer_manifest on Windows 32 and 64 bit builds, the versionfile will not create until the Puma project. # As copy_w_viewer_manifest does not seem to need the version attribute, we supress the exception for now. # raise diff --git a/indra/llcommon/indra_constants.h b/indra/llcommon/indra_constants.h index 0899fb63..98eb7640 100644 --- a/indra/llcommon/indra_constants.h +++ b/indra/llcommon/indra_constants.h @@ -32,7 +32,7 @@ class LLUUID; // Centralize definition of application name -const std::string APP_NAME = "Firestorm"; +const std::string APP_NAME = "Puma"; static const F32 REGION_WIDTH_METERS = 256.f; static const S32 REGION_WIDTH_UNITS = 256; diff --git a/indra/llcommon/res/llcommon.rc.in b/indra/llcommon/res/llcommon.rc.in index 2de14b72..ebd8576a 100644 --- a/indra/llcommon/res/llcommon.rc.in +++ b/indra/llcommon/res/llcommon.rc.in @@ -40,13 +40,13 @@ BEGIN BEGIN BLOCK "040904b0" BEGIN - VALUE "CompanyName", "Phoenix Viewer" - VALUE "FileDescription", "Phoenix Firestorm Viewer Common Library" + VALUE "CompanyName", "Puma Viewer" + VALUE "FileDescription", "Avatares Argentinos" VALUE "FileVersion", "2.6.1.18383" VALUE "InternalName", "llcommon.dll" - VALUE "LegalCopyright", "Copyright © 2010 Phoenix Viewer" + VALUE "LegalCopyright", "Copyright © 2025 Avatares Argentinos" VALUE "OriginalFilename", "llcommon.dll" - VALUE "ProductName", "Phoenix Firestorm Viewer" + VALUE "ProductName", "Puma Viewer" VALUE "ProductVersion", "2.6.1.18383" END END diff --git a/indra/llinventory/llfoldertype.h b/indra/llinventory/llfoldertype.h index ec97ab50..f8ad83f3 100644 --- a/indra/llinventory/llfoldertype.h +++ b/indra/llinventory/llfoldertype.h @@ -99,6 +99,7 @@ public: FT_FIRESTORM = 58, FT_PHOENIX = 59, FT_RLV = 60, + FT_PUMA = 70, // Folder types for our own virtual system folders FT_MY_SUITCASE = 100, // OpenSim HG-support diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index c4446a8d..1d169bc9 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -142,8 +142,6 @@ set(viewer_SOURCE_FILES fsfloaterwhitelisthelper.cpp fsjointpose.cpp fskeywords.cpp - fslslbridge.cpp - fslslbridgerequest.cpp fslslpreproc.cpp fslslpreprocviewer.cpp fsmaniprotatejoint.cpp @@ -961,8 +959,6 @@ set(viewer_HEADER_FILES fsjointpose.h fsgridhandler.h fskeywords.h - fslslbridge.h - fslslbridgerequest.h fslslpreproc.h fslslpreprocviewer.h fsmoneytracker.h diff --git a/indra/newview/app_settings/commands.xml b/indra/newview/app_settings/commands.xml index 7f26b290..665ac41d 100644 --- a/indra/newview/app_settings/commands.xml +++ b/indra/newview/app_settings/commands.xml @@ -561,15 +561,6 @@ is_running_function="Floater.IsOpen" is_running_parameters="conversation" /> - - localhost:9000 + alternatemetaverse.com:8002 + + LastModified + 2020-06-02T11:41:00.95Z + gridname + Alternate Metaverse + gridnick + AMV + login_identifier_types + + agent + account + + loginpage + https://alternatemetaverse.com/splash + loginuri + + http://alternatemetaverse.com:8002 + + name + alternatemetaverse.com:8002 + platform + OpenSim + slurl_base + hop://alternatemetaverse.com:8002/ + + astralia.eu:8002 + + LastModified + 2020-06-02T11:43:19.89Z + gatekeeper + astralia.eu:8002 + gridname + astralia + gridnick + astralia + helperuri + http://astralia.eu//currency/helper/landtool.php + login_identifier_types + + agent + account + + loginpage + http://astralia.eu + loginuri + + http://astralia.eu:8002/ + + name + astralia.eu:8002 + platform + OpenSim + slurl_base + hop://astralia.eu:8002/ + + cc.opensimulator.org:8002 + + LastModified + 2019-12-09T10:00:00Z + gatekeeper + cc.opensimulator.org:8002 + gridname + OpenSim Community Conference + gridnick + opensimcc + helperuri + http://cc.opensimulator.org/helper/ + login_identifier_types + + agent + account + + loginpage + http://cc.opensimulator.org:8005/wifi/welcome.html + loginuri + + http://cc.opensimulator.org:8002/ + + name + cc.opensimulator.org:8002 + password + http://cc.opensimulator.org:8005/wifi/forgotpassword + platform + OpenSim + register + http://cc.opensimulator.org:8005/wifi/user/account + slurl_base + hop://cc.opensimulator.org:8002/ + + craft-world.org:8002 + + LastModified + 2020-06-02T14:23:31.86Z + about + https://www.craft-world.org/ + gatekeeper + craft-world.org:8002 + gridname + Craft World + gridnick + craft + help + https://www.craft-world.org/page/en/support.php + helperuri + http://webapp.craft-world.org/economy/ + login_identifier_types + + agent + account + + loginpage + https://www.craft-world.org/loginscreen.php + loginuri + + http://craft-world.org:8002/ + + name + craft-world.org:8002 + password + https://www.craft-world.org/page/en/avatar-tools.php + platform + OpenSim + register + https://www.craft-world.org/page/en/register-an-avatar.php + slurl_base + hop://craft-world.org:8002/ + + discoverygrid.net:8002 + + LastModified + 2020-04-24T12:06:59.18Z + about + https://discoverygrid.net/about.php + gatekeeper + discoverygrid.net:8002 + gridname + DiscoveryGrid + gridnick + DiscoveryGrid + help + https://discoverygrid.net + helperuri + https://discoverygrid.net/apps/ + login_identifier_types + + agent + account + + loginpage + https://discoverygrid.net/viewersplash.php + loginuri + + http://discoverygrid.net:8002/ + + name + discoverygrid.net:8002 + password + https://discoverygrid.net/#needpw + platform + OpenSim + register + https://discoverygrid.net/index.php#create + slurl_base + hop://discoverygrid.net:8002/ + + fireandicegrid.net:8002 + + LastModified + 2020-06-02T11:41:59.83Z + about + http://fireandicegrid.net + gatekeeper + fireandicegrid.net:8002 + gridname + Fire And Ice Grid + gridnick + FireAndIceGrid + help + http://fireandicegrid.net + helperuri + http://fireandicegrid.net + login_identifier_types + + agent + account + + loginpage + http://fireandicegrid.net + loginuri + + http://fireandicegrid.net:8002/ + + name + fireandicegrid.net:8002 + password + http://fireandicegrid.net:8002/wifi + platform + OpenSim + register + http://fireandicegrid.net:8002/wifi + slurl_base + hop://fireandicegrid.net:8002/ + + goto.theencoreescape.com:8002 + + DirectoryFee + 0 + LastModified + 2020-04-24T17:00:50.92Z + SendGridInfoToViewerOnLogin + true + about + http://theencoreescape.com/ + gatekeeper + goto.theencoreescape.com:8002 + gridname + The Encore Escape + gridnick + EncoreEscape + help + http://theencoreescape.com/ + helperuri + http://money.theencoreescape.com/ + login_identifier_types + + agent + account + + loginpage + http://splash.theencoreescape.com/ + loginuri + + http://goto.theencoreescape.com:8002/ + + name + goto.theencoreescape.com:8002 + password + http://theencoreescape.com/ + platform + OpenSim + register + http://theencoreescape.com/ + search + http://search.theencoreescape.com/query.php + slurl_base + hop://goto.theencoreescape.com:8002/ + + grid.3rdrockgrid.com:8002 + + LastModified + 2012-08-03T15:32:54.31Z + about + http://3rdrockgrid.com/ + gridname + 3RD Rock Grid + gridnick + 3RG + help + http://3rdrockgrid.com/ + helperuri + http://grid.3rdrockgrid.com/3rg_money/ + login_identifier_types + + agent + account + + loginpage + http://grid.3rdrockgrid.com/3rg_login/ + loginuri + + http://grid.3rdrockgrid.com:8002/ + + name + grid.3rdrockgrid.com:8002 + password + http://3rdrockgrid.com/ + register + http://3rdrockgrid.com/ + slurl_base + hop://grid.3rdrockgrid.com:8002/ + + grid.avacon.org:8002 + + LastModified + 2020-06-02T12:01:35.02Z + gatekeeper + grid.avacon.org:8002 + gridname + AvaCon Grid + gridnick + avacon + helperuri + http://grid.avacon.org/helper/ + login_identifier_types + + agent + account + + loginpage + http://grid.avacon.org:8005/wifi/welcome.html + loginuri + + http://grid.avacon.org:8002/ + + name + grid.avacon.org:8002 + password + http://grid.avacon.org:8005/wifi/forgotpassword + platform + OpenSim + register + http://grid.avacon.org:8005/wifi/user/account + slurl_base + hop://grid.avacon.org:8002/ + + grid.kitely.com:8002 + + LastModified + 2014-03-20T12:30:00Z + gatekeeper + grid.kitely.com:8002 + gridname + Kitely + gridnick + kitely + helperuri + http://grid.kitely.com:8002/ + login_identifier_types + + agent + account + + loginpage + http://www.kitely.com/viewer_login + loginuri + + http://grid.kitely.com:8002/ + + name + grid.kitely.com:8002 + platform + OpenSim + slurl_base + hop://grid.kitely.com:8002/ + + grid.virtualife.cloud:8002 + + LastModified + 2019-12-04T10:50:32.55Z + about + http://www.virtualife.cloud + gatekeeper + grid.virtualife.cloud:8002 + gridname + virtualife world + gridnick + Virtualife world + login_identifier_types + + agent + account + + loginpage + http://www.virtualife.cloud/index.php?option=com_opensim + loginuri + + http://grid.virtualife.cloud:8002/ + + name + grid.virtualife.cloud:8002 + password + http://grid.virtualife.cloud:8002/wifi/forgotpassword + platform + OpenSim + register + http://grid.virtualife.cloud:8002/wifi/user/account + slurl_base + hop://grid.virtualife.cloud:8002/ + + hypergrid.org:8002 + + LastModified + 2013-04-02T01:01:24.65Z + about + http://www.hypergrid.org/metropolis/wiki + gatekeeper + hypergrid.org:8002 + gridname + Metropolis Metaversum + gridnick + Metropolis + help + http://metropolis.hypergrid.org/forum + helperuri + http://metropolis.hypergrid.org/currency/helper/ + login_identifier_types + + agent + account + + loginpage + http://metropolis.hypergrid.org + loginuri + + http://hypergrid.org:8002/ + + name + hypergrid.org:8002 + password + http://metropolis.hypergrid.org/password.php + platform + OpenSim + register + http://www.hypergrid.org/metropolis/metro_rg.php + slurl_base + hop://hypergrid.org:8002/ + + islandoasisgrid.biz:8002 + + LastModified + 2013-01-21T20:10:35.17Z + about + http://www.islandoasis.biz/GridStats.aspx + gridname + Island Oasis + gridnick + Island_Oasis + help + http://www.islandoasis.biz/Support.aspx + helperuri + http://islandoasisgrid:8020/OsCurrency/ + login_identifier_types + + agent + account + + loginpage + http://www.islandoasis.biz/welcome.aspx + loginuri + + http://islandoasisgrid.biz:8002/ + + name + islandoasisgrid.biz:8002 + password + http://www.islandoasis.biz/Login.aspx + platform + OpenSim + register + http://www.islandoasis.biz/verification.aspx + slurl_base + hop://islandoasisgrid.biz:8002/ + + lfgrid.com:8002 + + LastModified + 2013-03-18T21:51:17.62Z + about + http://lfgrid.com/about/ + gatekeeper + lfgrid.com:8002 + gridname + Littlefield Grid + gridnick + LFgrid + help + http://lfgrid.com/help + helperuri + http://lfgrid.com/services/ + login_identifier_types + + agent + account + + loginpage + http://www.lfgrid.com/splash/index.php + loginuri + + http://lfgrid.com:8002/ + + name + lfgrid.com:8002 + password + http://lfgrid.com:8002/wifi/forgotpassword + platform + OpenSim + register + http://lfgrid.com:8002/wifi/user/account/ + slurl_base + hop://lfgrid.com:8002/ + + localhost:9000 LastModified 2024-05-28T12:00:00Z @@ -25,8 +517,386 @@ localhost:9000 slurl_base hop://localhost:9000/ - - util.aditi.lindenlab.com + + login.aviworlds.com:8002 + + DirectoryFee + 0 + LastModified + 2020-06-02T11:41:55.32Z + SendGridInfoToViewerOnLogin + true + about + http://aviworlds.com + gatekeeper + login.aviworlds.com:8002 + gridname + AviWorlds + gridnick + Avi + help + http://aviworlds.com + helperuri + http://login.aviworlds.com/helper_scripts/helper/ + login_identifier_types + + agent + account + + loginpage + http://login.aviworlds.com/splash + loginuri + + http://login.aviworlds.com:8002/ + + name + login.aviworlds.com:8002 + password + http://login.aviworlds.com:8002/wifi/forgotpassword + platform + OpenSim + register + http://login.aviworlds.com:8002/wifi/user/account/ + search + http://login.aviworlds.com/ossearch/query.php + slurl_base + hop://login.aviworlds.com:8002/ + + login.digiworldz.com:8002 + + DirectoryFee + 0 + LastModified + 2015-07-24T13:19:44.27Z + SendGridInfoToViewerOnLogin + true + about + http://digiworldz.com/ + gatekeeper + login.digiworldz.com:8002 + gridname + DigiWorldZ Grid + gridnick + DWG + help + http://digiworldz.com/ + helperuri + http://money.digiworldz.com/ + login_identifier_types + + agent + account + + loginpage + http://splash.digiworldz.com/ + loginuri + + http://login.digiworldz.com:8002/ + + name + login.digiworldz.com:8002 + password + http://digiworldz.com/ + platform + OpenSim + register + http://digiworldz.com/ + search + http://search.digiworldz.com/query.php + slurl_base + hop://login.digiworldz.com:8002/ + + login.francogrid.org:80 + + LastModified + 2013-02-14T02:00:46.10Z + about + http://francogrid.org/ + gridname + FrancoGrid + gridnick + francogrid + help + http://francogrid.org/aide + helperuri + http://helper.main.francogrid.org/ + login_identifier_types + + agent + account + + loginpage + http://viewer.francogrid.org/ + loginuri + + http://login.francogrid.org/ + + name + login.francogrid.org:80 + password + http://francogrid.org/user/password + platform + OpenSim + register + http://francogrid.org/user/register + slurl_base + hop://login.francogrid.org:80/ + + login.osgrid.org + + LastModified + 2019-04-19T21:15:00Z + about + http://www.osgrid.org/ + gatekeeper + hg.osgrid.org:80 + gridname + OSGrid + gridnick + osgrid + help + http://www.osgrid.org/ + helperuri + http://helper.osgrid.org/ + login_identifier_types + + agent + account + + loginpage + http://www.osgrid.org/splash/ + loginuri + + http://login.osgrid.org/ + + name + login.osgrid.org + password + http://www.osgrid.org/ + platform + + register + http://www.osgrid.org/ + slurl_base + hop://login.osgrid.org/ + web_profile_url + http://my.osgrid.org/?name=[AGENT_NAME] + + login.zetaworlds.com + + LastModified + 2020-06-02T12:39:31.19Z + about + https://zetaworlds.com/ + gridname + ZetaWorlds + gridnick + ZetaWorlds + helperuri + http://money.zetaworlds.com/ + login_identifier_types + + agent + account + + loginpage + http://zetaworlds.com/splash + loginuri + + https://login.zetaworlds.com/ + + name + login.zetaworlds.com + password + https://zetaworlds.com/user/forgot + platform + OpenSim + register + http://zetaworlds.com/user/register + slurl_base + hop://login.zetaworlds.com/ + + login.zonenations.com:8002 + + LastModified + 2019-12-04T10:43:24.96Z + about + https://www.zonenations.com/ + gatekeeper + login.zonenations.com:8002 + gridname + Zone Nations + gridnick + ZoneNations + help + https://www.zonenations.com/supporto.html + helperuri + https://www.zonenations.com/components/com_opensim/ + login_identifier_types + + agent + account + + loginpage + https://www.zonenations.com/index.php?option=com_opensim + loginuri + + http://login.zonenations.com:8002/ + + name + login.zonenations.com:8002 + password + https://www.zonenations.com/password-smarrita.html + platform + OpenSim + register + https://www.zonenations.com/iscriviti.html + slurl_base + hop://login.zonenations.com:8002/ + + main.mobiusgrid.us + + LastModified + 2020-06-02T13:19:55.40Z + about + https://mobiusgrid.us/about + gridname + Mobius Grid + gridnick + Mobius + help + https://mobiusgrid.us/help + login_identifier_types + + agent + account + + loginpage + https://mobiusgrid.us/splash + loginuri + + http://login.main.mobiusgrid.us + + name + main.mobiusgrid.us + password + https://mobiusgrid.us/forgot + platform + OpenSim + register + https://mobiusgrid.us/join + slurl_base + hop://main.mobiusgrid.us/ + + partydestinationgrid.com:8002 + + LastModified + 2019-12-04T10:48:17.58Z + about + https://partydestinationgrid.com/ + gatekeeper + partydestinationgrid.com:8002 + gridname + Party Destination Grid + gridnick + partydestinationgrid + help + https://partydestinationgrid.com/index.php/help/help + helperuri + http://partydestinationgrid.com/components/com_opensim/ + login_identifier_types + + agent + account + + loginpage + http://module.partydestinationgrid.com/login + loginuri + + http://partydestinationgrid.com:8002/ + + name + partydestinationgrid.com:8002 + platform + OpenSim + register + https://partydestinationgrid.com/index.php/component/users/?view=registration + slurl_base + hop://partydestinationgrid.com:8002/ + + tanglegrid.net:8002 + + LastModified + 2019-12-04T10:49:43.20Z + about + http://tanglegrid.com/ + gatekeeper + tanglegrid.net:8002 + gridname + TanGLe Grid + gridnick + TanGLe + help + http://tanglegrid.com/contact.php + helperuri + http://tanglegrid.net/scripts/helper/ + login_identifier_types + + agent + account + + loginpage + http://tanglegrid.net/web_interface/loginscreen.php + loginuri + + http://tanglegrid.net:8002/ + + name + tanglegrid.net:8002 + password + http://www.tanglegrid.net/web_interface/index.php?page=forgotpass + platform + OpenSim + register + http://www.tanglegrid.net/web_interface/avatar.php + search + http://www.tanglegrid.net/helper/query.php + slurl_base + hop://tanglegrid.net:8002/ + + thekazgrid.com:8002 + + LastModified + 2019-12-04T10:47:15.79Z + about + https://www.thekazgrid.com/index.php/11-about/6-about + gridname + TheKaz Grid + gridnick + TheKaz + helperuri + https://www.thekazgrid.com/currency/helper/ + login_identifier_types + + agent + account + + loginpage + https://www.thekazgrid.com/index.php?option=com_opensim + loginuri + + http://thekazgrid.com:8002/ + + name + thekazgrid.com:8002 + platform + OpenSim + register + https://www.thekazgrid.com/index.php/join + slurl_base + hop://thekazgrid.com:8002/ + + util.aditi.lindenlab.com LastModified 2018-09-26T20:15:00Z @@ -43,52 +913,130 @@ agent loginpage - http://phoenixviewer.com/app/loginV3/ + https://viewer-splash.secondlife.com/ loginuri https://login.aditi.lindenlab.com/cgi-bin/login.cgi - name + name util.aditi.lindenlab.com - slurl_base + slurl_base secondlife://util.aditi.lindenlab.com/secondlife/ - system_grid + system_grid 1 - web_profile_url + web_profile_url https://my.aditi.lindenlab.com/ - util.agni.lindenlab.com + util.agni.lindenlab.com - LastModified + LastModified 2018-06-22T22:15:00Z - app_slurl_base + app_slurl_base secondlife:///app - favorite + favorite 1 - gridname + gridname Second Life - gridnick + gridnick agni helperuri - https://secondlife.com/helpers/ + https://secondlife.com/helpers/ login_identifier_types - - agent - + + agent + loginpage - http://phoenixviewer.com/app/loginV3/ + https://viewer-splash.secondlife.com/ loginuri - - https://login.agni.lindenlab.com/cgi-bin/login.cgi - + + https://login.agni.lindenlab.com/cgi-bin/login.cgi + name - util.agni.lindenlab.com + util.agni.lindenlab.com slurl_base - http://maps.secondlife.com/secondlife/ + http://maps.secondlife.com/secondlife/ system_grid - 1 + 1 web_profile_url - https://my.secondlife.com/ + https://my.secondlife.com/ + + vidadupla.com.br:8002 + + DirectoryFee + 0 + LastModified + 2020-11-06T14:42:01.07Z + SendGridInfoToViewerOnLogin + true + about + http://vidadupla.com.br + gatekeeper + vidadupla.com.br:8002 + gridname + Vida Dupla + gridnick + VD + helperuri + http://vidadupla.com.br/helper_scripts/helper/ + login_identifier_types + + agent + account + + loginpage + http://vidadupla.com.br/splash + loginuri + + http://vidadupla.com.br:8002/ + + name + vidadupla.com.br:8002 + password + http://vidadupla.com.br:8002/wifi/forgotpassword + platform + OpenSim + register + http://vidadupla.com.br:8002/wifi/user/account/ + search + http://vidadupla.com.br/ossearch/query.php + slurl_base + hop://vidadupla.com.br:8002/ + + www.alifevirtual.com:8002 + + LastModified + 2020-05-30T09:41:01.73Z + about + http://www.alifevirtual.com/ + gridname + Alife Virtual + gridnick + AV + help + http://www.alifevirtual.com/ + helperuri + http://www.alifevirtual.com/helper/ + login_identifier_types + + agent + account + + loginpage + http://www.alifevirtual.com/welcome.php + loginuri + + http://www.alifevirtual.com:8002/ + + name + www.alifevirtual.com:8002 + password + http://www.alifevirtual.com/ + platform + OpenSim + register + http://www.alifevirtual.com/ + slurl_base + hop://www.alifevirtual.com:8002/ diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 76a3f737..15c5df33 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -16429,17 +16429,6 @@ Change of this parameter will affect the layout of buttons in notification toast Value 77a018af-098e-c037-51a6-178f05877c6f - UISndMovelockToggle - - Comment - Sound file for toggling movelock (uuid for sound asset) - Persist - 1 - Type - String - Value - 4174f859-0d3d-c517-c424-72923dc21f65 - UISndNewIncomingIMSession Comment @@ -17416,28 +17405,6 @@ Change of this parameter will affect the layout of buttons in notification toast Value - UseLSLBridge - - Comment - Use the client LSL bridge for lsl functionality - Persist - 1 - Type - Boolean - Value - 1 - - RelockMoveLockAfterRegionChange - - Comment - TRUE: Re-lock movelock after region change - refresh avatar position and send to LSL-Client Bridge script. FALSE: Disengage the lock automatically after region change. - Persist - 1 - Type - Boolean - Value - 1 - VelocityInterpolate Comment @@ -22201,17 +22168,6 @@ Change of this parameter will affect the layout of buttons in notification toast Value 1 - PlayModeUISndMovelockToggle - - Comment - Holds state for Prefs > Sound/Media > UI Sounds - UISndMovelockToggle. - Persist - 1 - Type - Boolean - Value - 1 - PlayModeUISndNewIncomingIMSession Comment diff --git a/indra/newview/app_settings/settings_per_account.xml b/indra/newview/app_settings/settings_per_account.xml index 1b027b4d..13424e46 100644 --- a/indra/newview/app_settings/settings_per_account.xml +++ b/indra/newview/app_settings/settings_per_account.xml @@ -974,73 +974,6 @@ Value 0 - UseLSLFlightAssist - - Comment - Use the client LSL bridge for flight boost - boost power: 0.0 (disabled), 0.5 (mild), 1.0 (moderate), 2.0 (high), 15.0 (extreme). - Persist - 1 - Type - F32 - Value - 0.0 - - UseMoveLock - - Comment - Use the client LSL Bridge for movelock - Persist - 1 - Type - Boolean - Value - 0 - - RelockMoveLockAfterMovement - - Comment - If movelock built-in into LSL Bridge is active, then lock and unlock position after stopping or starting movement - Persist - 1 - Type - Boolean - Value - 1 - - MoveLockInfoVisibleOnScreen - - Comment - If movelock built-in into LSL Bridge is active, then show info on screen all the time - Persist - 1 - Type - Boolean - Value - 1 - - BridgeIntegrationOC - - Comment - Allow OpenCollar protocol to enable or disable built in AO. Client LSL Bridge needs to be enabled. - Persist - 1 - Type - Boolean - Value - 1 - - BridgeIntegrationLM - - Comment - Allow LockMeister protocol to enable or disable built in AO. Client LSL Bridge needs to be enabled. - Persist - 1 - Type - Boolean - Value - 1 - - FSStoredCameraPos diff --git a/indra/newview/fsareasearch.cpp b/indra/newview/fsareasearch.cpp index ef4efc84..2e732306 100644 --- a/indra/newview/fsareasearch.cpp +++ b/indra/newview/fsareasearch.cpp @@ -50,7 +50,6 @@ #include "lltabcontainer.h" #include "llspinctrl.h" #include "lltoolgrab.h" -#include "fslslbridge.h" #include "llcombobox.h" #include "llnotificationsutil.h" #include "fsassetblacklist.h" @@ -1662,7 +1661,7 @@ bool FSPanelAreaSearchList::onContextMenuItemEnable(const LLSD& userdata) } else if (parameter == "script") { - return (mResultList->getNumSelected() > 0 && enable_bridge_function()); + return (mResultList->getNumSelected() > 0 ); } else { @@ -1790,9 +1789,6 @@ bool FSPanelAreaSearchList::onContextMenuItemClick(const LLSD& userdata) cnt++; } break; - case 's': // script - FSLSLBridge::instance().viewerToLSL("getScriptInfo|" + item->getUUID().asString() + "|" + (gSavedSettings.getBOOL("FSScriptInfoExtended") ? "1" : "0")); - break; case 'l': // blacklist { const LLUUID& object_id = item->getUUID(); diff --git a/indra/newview/fsfloaterperformance.cpp b/indra/newview/fsfloaterperformance.cpp index 81279fc4..6805bdb8 100644 --- a/indra/newview/fsfloaterperformance.cpp +++ b/indra/newview/fsfloaterperformance.cpp @@ -55,7 +55,6 @@ #include "fsavatarrenderpersistence.h" #include "llpresetsmanager.h" #include "llwindow.h" -#include "fslslbridge.h" #include "llbutton.h" extern F32 gSavedDrawDistance; @@ -484,11 +483,6 @@ void FSFloaterPerformance::populateHUDList() LLViewerObject* attached_object = attachment_iter->get(); if (attached_object && attached_object->isHUDAttachment()) { - if (attached_object->getAttachmentItemName() == FSLSLBridge::instance().currentFullName()) - { - continue; - } - max_gpu_time = llmax(max_gpu_time, attached_object->mGPURenderTime); } } @@ -510,10 +504,6 @@ void FSFloaterPerformance::populateHUDList() LLViewerObject* attached_object = attachment_iter->get(); if (attached_object && attached_object->isHUDAttachment()) { - if (attached_object->getAttachmentItemName() == FSLSLBridge::instance().currentFullName()) - { - continue; - } F32 gpu_time = attached_object->mGPURenderTime; diff --git a/indra/newview/fsgridhandler.cpp b/indra/newview/fsgridhandler.cpp index b4c4a8ef..6b637f15 100644 --- a/indra/newview/fsgridhandler.cpp +++ b/indra/newview/fsgridhandler.cpp @@ -150,7 +150,7 @@ void gridDownloadComplete( LLSD const &aData, LLGridManager* mOwner, GridEntry* } } -const char* DEFAULT_LOGIN_PAGE = "https://phoenixviewer.com/app/loginV3/"; +const char* DEFAULT_LOGIN_PAGE = "https://viewer-splash.secondlife.com/"; const char* SYSTEM_GRID_SLURL_BASE = "secondlife://%s/secondlife/"; const char* MAIN_GRID_SLURL_BASE = "http://maps.secondlife.com/secondlife/"; diff --git a/indra/newview/fsradar.cpp b/indra/newview/fsradar.cpp index 4d66ecce..90ff1574 100644 --- a/indra/newview/fsradar.cpp +++ b/indra/newview/fsradar.cpp @@ -39,8 +39,6 @@ #include "fsassetblacklist.h" #include "fscommon.h" #include "fskeywords.h" -#include "fslslbridge.h" -#include "fslslbridgerequest.h" #include "lggcontactsets.h" #include "lfsimfeaturehandler.h" #include "llagent.h" @@ -187,7 +185,6 @@ void FSRadar::updateRadarList() LLViewerParcelMgr& parcelmgr = LLViewerParcelMgr::instance(); LLUIColorTable& colortable = LLUIColorTable::instance(); LLAvatarTracker& avatartracker = LLAvatarTracker::instance(); - FSLSLBridge& bridge = FSLSLBridge::instance(); LFSimFeatureHandler& simfeaturehandler = LFSimFeatureHandler::instance(); const F32 chat_range_say = (F32)simfeaturehandler.sayRange(); @@ -219,7 +216,6 @@ void FSRadar::updateRadarList() static LLCachedControl sFSRadarColorNamesByDistance(gSavedSettings, "FSRadarColorNamesByDistance", false); static LLCachedControl sFSRadarShowMutedAndDerendered(gSavedSettings, "FSRadarShowMutedAndDerendered"); static LLCachedControl sFSRadarEnhanceByBridge(gSavedSettings, "FSRadarEnhanceByBridge"); - bool sUseLSLBridge = bridge.canUseBridge(); F32 drawRadius(sRenderFarClip); const LLVector3d& posSelf = gAgent.getPositionGlobal(); @@ -362,7 +358,7 @@ void FSRadar::updateRadarList() } //schedule offset requests, if needed - if (sUseLSLBridge && sFSRadarEnhanceByBridge && (now > (mRadarLastBulkOffsetRequestTime + FSRADAR_COARSE_OFFSET_INTERVAL)) && (now > lastZOffsetTime + FSRADAR_COARSE_OFFSET_INTERVAL)) + if (now > (mRadarLastBulkOffsetRequestTime + FSRADAR_COARSE_OFFSET_INTERVAL) && (now > lastZOffsetTime + FSRADAR_COARSE_OFFSET_INTERVAL)) { mRadarOffsetRequests.push_back(avId); ent->mLastZOffsetTime = now; @@ -667,7 +663,6 @@ void FSRadar::updateRadarList() if (++updatesPerRequest > FSRADAR_MAX_OFFSET_REQUESTS) { msg = msg.substr(0, msg.size() - 1); - bridge.viewerToLSL(prefix + msg, FSLSLBridgeRequestRadarPos_Success); //LL_INFOS() << " OFFSET REQUEST SEGMENT"<< prefix << msg << LL_ENDL; msg.clear(); updatesPerRequest = 0; @@ -676,7 +671,6 @@ void FSRadar::updateRadarList() if (updatesPerRequest > 0) { msg = msg.substr(0, msg.size() - 1); - bridge.viewerToLSL(prefix + msg, FSLSLBridgeRequestRadarPos_Success); //LL_INFOS() << " OFFSET REQUEST FINAL " << prefix << msg << LL_ENDL; } diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index f9728df6..6ab2e2bc 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -114,7 +114,6 @@ // Firestorm includes #include "fsfloaternearbychat.h" -#include "fslslbridge.h" #include "llpresetsmanager.h" #include "NACLantispam.h" @@ -4756,43 +4755,6 @@ void LLAgent::clearVisualParams(void *data) //--------------------------------------------------------------------------- // Teleport //--------------------------------------------------------------------------- -// Client LSL Bridge -bool LLAgent::teleportBridgeLocal(LLVector3& pos_local) -{ - std::stringstream msgstream; - msgstream << std::setiosflags(std::ios::fixed) << std::setprecision(6); - msgstream << pos_local.mV[VX] << ", " << pos_local.mV[VY] << ", " << pos_local.mV[VZ]; - - // Check for FIRE-10718: llGetSimulatorHostname() is causing LSL Bridge to sleep for 10 seconds during check for current hostname in order to prevent double-click teleport on SL grid, so let's check this in the viewer itself and send 1/0 as additional value -#ifdef OPENSIM - const std::string isLindenLabHost = LLGridManager::getInstance()->isInSecondLife() ? "1" : "0"; -#else - const std::string isLindenLabHost = "1"; -#endif - - return FSLSLBridge::instance().viewerToLSL("llMoveToTarget|" + msgstream.str() + "|" + isLindenLabHost); -} - -bool LLAgent::teleportBridgeGlobal(const LLVector3d& pos_global) -{ - // FIRE-30534 VarRegion fixes - // U64 region_handle = to_region_handle(pos_global); - U64 region_handle{}; - auto regionp = getRegion(); - if(regionp) - { - region_handle = to_region_handle(pos_global, regionp->getOriginGlobal(), regionp->getWidth()); - } - else - { - region_handle = to_region_handle(pos_global); - } - // - LLVector3 pos_local = (LLVector3)(pos_global - from_region_handle(region_handle)); - - return teleportBridgeLocal(pos_local); -} -// Client LSL Bridge // teleportCore() - stuff to do on any teleport // protected @@ -5424,12 +5386,6 @@ void LLAgent::doTeleportViaLocation(const LLVector3d& pos_global) << LL_ENDL; // } -// Client LSL Bridge - if (FSLSLBridge::instance().canUseBridge() && is_local) - { - teleportBridgeGlobal(pos_global); - } -// } // Teleport to global position, but keep facing in the same direction @@ -5487,15 +5443,6 @@ void LLAgent::teleportViaLocationLookAt(const LLVector3d& pos_global, const LLVe // LLVector3 pos_local = (LLVector3)(pos_global - from_region_handle(region_handle)); // teleportRequest(region_handle, pos_local, look_at); -// // Client LSL Bridge -// if (FSLSLBridge::instance().canUseBridge()) -// { -// if (region_handle == to_region_handle(getPositionGlobal())) -// { -// teleportBridgeLocal(pos_local); -// } -// } -// // // } void LLAgent::doTeleportViaLocationLookAt(const LLVector3d& pos_global, const LLVector3& look_at) { @@ -5521,17 +5468,6 @@ void LLAgent::doTeleportViaLocationLookAt(const LLVector3d& pos_global, const LL LLVector3 pos_within_target_region = (LLVector3)(pos_global - from_region_handle(region_handle)); teleportRequest(region_handle, pos_within_target_region, look_at); -// Client LSL Bridge - if ( FSLSLBridge::instance().canUseBridge() ) - { - // refresh regionp - regionp = getRegion(); - if( regionp && ( region_handle == regionp->getHandle() ) ) - { - teleportBridgeLocal(pos_within_target_region); - } - } -// } // LLAgent::ETeleportState LLAgent::getTeleportState() const @@ -6101,7 +6037,7 @@ void LLAgent::renderAutoPilotTarget() // Phantom mode void LLAgent::togglePhantom() { - make_ui_sound("UISndMovelockToggle"); + // make_ui_sound("UISndMovelockToggle"); mPhantom = !mPhantom; if (mPhantom) { diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp index 1a663eb4..0232c062 100644 --- a/indra/newview/llappearancemgr.cpp +++ b/indra/newview/llappearancemgr.cpp @@ -73,8 +73,6 @@ #include "rlvlocks.h" // [/RLVa:KB] -#include "fslslbridge.h" - namespace { const S32 BAKE_RETRY_MAX_COUNT = 5; @@ -1758,23 +1756,6 @@ void LLAppearanceMgr::takeOffOutfit(const LLUUID& cat_id) gInventory.collectDescendentsIf(cat_id, cats, items, false, collector); -// Client LSL Bridge - if (FSLSLBridge::instance().canUseBridge()) - { - LL_INFOS("FSLSLBridge") << "reinserting bridge at outfit remove" << LL_ENDL; - for (LLInventoryModel::item_array_t::iterator i = items.begin(); i != items.end(); ++i) - { - const LLViewerInventoryItem* item = *i; - - if (item->getName() == FSLSLBridge::instance().currentFullName()) - { - items.erase(i); - break; - } - } - } -// - LLInventoryModel::item_array_t::const_iterator it = items.begin(); const LLInventoryModel::item_array_t::const_iterator it_end = items.end(); uuid_vec_t uuids_to_remove; @@ -1860,13 +1841,6 @@ void LLAppearanceMgr::slamCategoryLinks(const LLUUID& src_id, const LLUUID& dst_ { const LLViewerInventoryItem* item = (*iter); - // Don't add LSL bridge to outfit - if (item->getName() == FSLSLBridge::instance().currentFullName()) - { - continue; - } - // - switch (item->getActualType()) { case LLAssetType::AT_LINK: @@ -1920,12 +1894,6 @@ void LLAppearanceMgr::shallowCopyCategoryContents(const LLUUID& src_id, const LL ++iter) { const LLViewerInventoryItem* item = (*iter); - // Skip LSL bridge - if (item->getName() == FSLSLBridge::instance().currentFullName()) - { - continue; - } - // switch (item->getActualType()) { case LLAssetType::AT_LINK: @@ -2341,19 +2309,6 @@ void LLAppearanceMgr::updateCOF(LLInventoryModel::item_array_t& body_items_new, obj_items.insert(obj_items.end(), obj_items_new.begin(), obj_items_new.end()); // [/RLVa:KB] - // Client LSL Bridge - if (FSLSLBridge::instance().canUseBridge()) - { - //if replacing - make sure bridge stays. - if (!append && FSLSLBridge::instance().getBridge()) - { - LL_INFOS("FSLSLBridge") << "Reinserting bridge at outfit replace" << LL_ENDL; - obj_items.insert(obj_items.end(), FSLSLBridge::instance().getBridge()); - LL_INFOS("FSLSLBridge") << "Bridge reinserted" << LL_ENDL; - } - } - // - removeDuplicateItems(obj_items); // - Gestures: include COF contents only if appending. @@ -2781,19 +2736,6 @@ void LLAppearanceMgr::updateAppearanceFromCOF(bool enforce_item_restrictions, LLInventoryModel::item_array_t cof_item_array; get_sorted_base_and_cof_items(cof_item_array, outfit_item_array); - // Exclude LSL bridge or the following size check will always fail! - for (LLInventoryModel::item_array_t::iterator i = cof_item_array.begin(); i != cof_item_array.end(); ++i) - { - LLViewerInventoryItem *item = *i; - - if (FSLSLBridge::instance().isBridgeValid() && item && item->getLinkedUUID() == FSLSLBridge::instance().getBridge()->getUUID()) - { - cof_item_array.erase(i); - break; - } - } - // - if (outfit_item_array.size() == cof_item_array.size()) { for (U32 i = 0; i < cof_item_array.size(); ++i) @@ -3561,19 +3503,6 @@ void LLAppearanceMgr::updateIsDirty() } } - // FIRE-3018: Ignore the bridge when checking for dirty. - for (LLInventoryModel::item_array_t::iterator i = cof_items.begin(); i != cof_items.end(); ++i) - { - LLViewerInventoryItem *item = *i; - - if (FSLSLBridge::instance().isBridgeValid() && item && item->getLinkedUUID() == FSLSLBridge::instance().getBridge()->getUUID()) - { - cof_items.erase( i ); - break; - } - } - // - if(outfit_items.size() != cof_items.size()) { LL_DEBUGS("Avatar") << "item count different - base " << outfit_items.size() << " cof " << cof_items.size() << LL_ENDL; @@ -3798,19 +3727,6 @@ void update_base_outfit_after_ordering() } } - // Exclude LSL bridge or the following size check will always fail! - for (LLInventoryModel::item_array_t::iterator i = cof_item_array.begin(); i != cof_item_array.end(); ++i) - { - LLViewerInventoryItem *item = *i; - - if (FSLSLBridge::instance().isBridgeValid() && item && item->getLinkedUUID() == FSLSLBridge::instance().getBridge()->getUUID()) - { - cof_item_array.erase(i); - break; - } - } - // - if (outfit_item_array.size() != cof_item_array.size()) { return; @@ -4583,13 +4499,6 @@ void LLAppearanceMgr::removeItemsFromAvatar(const uuid_vec_t& ids_to_remove, nul continue; } - // LSL Bridge - if (FSLSLBridge::instance().canUseBridge() && linked_item_id == FSLSLBridge::instance().getBridge()->getUUID()) - { - continue; - } - // - LLViewerInventoryItem *item = gInventory.getItem(linked_item_id); if (item && item->getType() == LLAssetType::AT_OBJECT) { diff --git a/indra/newview/llavataractions.cpp b/indra/newview/llavataractions.cpp index c3409309..0aa72d9a 100644 --- a/indra/newview/llavataractions.cpp +++ b/indra/newview/llavataractions.cpp @@ -88,7 +88,6 @@ // Firestorm includes #include "fsfloaterim.h" #include "fsfloaterimcontainer.h" -#include "fslslbridge.h" #include "fsradar.h" #include "fsassetblacklist.h" #include "llagentpicksinfo.h" @@ -1949,7 +1948,7 @@ void LLAvatarActions::zoomIn(const LLUUID& idAgent) void LLAvatarActions::getScriptInfo(const LLUUID& idAgent) { LL_INFOS() << "Reporting Script Info for avatar: " << idAgent.asString() << LL_ENDL; - FSLSLBridge::instance().viewerToLSL("getScriptInfo|" + idAgent.asString() + "|" + (gSavedSettings.getBOOL("FSScriptInfoExtended") ? "1" : "0")); + //FSLSLBridge::instance().viewerToLSL("getScriptInfo|" + idAgent.asString() + "|" + (gSavedSettings.getBOOL("FSScriptInfoExtended") ? "1" : "0")); } diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp index c4e82192..7c27aed2 100644 --- a/indra/newview/llfloaterpreference.cpp +++ b/indra/newview/llfloaterpreference.cpp @@ -234,8 +234,6 @@ bool callback_clear_cache(const LLSD& notification, const LLSD& response); // bool callback_clear_inventory_cache(const LLSD& notification, const LLSD& response); void handleFlightAssistOptionChanged(const LLSD& newvalue); -void handleMovelockOptionChanged(const LLSD& newvalue); -void handleMovelockAfterMoveOptionChanged(const LLSD& newvalue); bool callback_clear_settings(const LLSD& notification, const LLSD& response); // bool callback_clear_debug_search(const LLSD& notification, const LLSD& response); diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index ff49570c..67144d65 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -90,7 +90,6 @@ #include "rlvlocks.h" // [/RLVa:KB] // Client LSL Bridge -#include "fslslbridge.h" #include "aoengine.h" // @@ -1464,13 +1463,6 @@ bool LLInvFVBridge::isLockedFolder(bool ignore_setting /*= false*/) const return false; } - if ((mUUID == FSLSLBridge::instance().getBridgeFolder() - || model->isObjectDescendentOf(mUUID, FSLSLBridge::instance().getBridgeFolder())) - && (gSavedPerAccountSettings.getBOOL("LockBridgeFolder") || ignore_setting)) - { - return true; - } - if ((mUUID == AOEngine::instance().getAOFolder() || model->isObjectDescendentOf(mUUID, AOEngine::instance().getAOFolder())) && (gSavedPerAccountSettings.getBOOL("LockAOFolders") || ignore_setting)) @@ -6532,7 +6524,6 @@ bool LLFolderBridge::isLocked() const static LLCachedControl LockWearableFavoritesFolders(gSavedPerAccountSettings, "LockWearableFavoritesFolders"); return ((mUUID == AOEngine::instance().getAOFolder() && LockAOFolders) || - (mUUID == FSLSLBridge::instance().getBridgeFolder() && LockBridgeFolder) || (mUUID == FSFloaterWearableFavorites::getFavoritesFolder() && LockWearableFavoritesFolders)); } // diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp index e6c88399..423e10d3 100644 --- a/indra/newview/llinventoryfunctions.cpp +++ b/indra/newview/llinventoryfunctions.cpp @@ -99,7 +99,6 @@ // Firestorm includes #include "aoengine.h" #include "fsfloaterwearablefavorites.h" -#include "fslslbridge.h" #include "llfloatermarketplacelistings.h" #include "llfloaterproperties.h" @@ -750,9 +749,6 @@ bool get_is_item_removable(const LLInventoryModel* model, const LLUUID& id, bool (model->isObjectDescendentOf(id, AOEngine::instance().getAOFolder()) && gSavedPerAccountSettings.getBOOL("LockAOFolders")) || - (model->isObjectDescendentOf(id, FSLSLBridge::instance().getBridgeFolder()) - && gSavedPerAccountSettings.getBOOL("LockBridgeFolder")) - || (model->isObjectDescendentOf(id, FSFloaterWearableFavorites::getFavoritesFolder()) && gSavedPerAccountSettings.getBOOL("LockWearableFavoritesFolders")) ) @@ -889,9 +885,6 @@ bool get_is_category_removable(const LLInventoryModel* model, const LLUUID& id) ((id == AOEngine::instance().getAOFolder() || model->isObjectDescendentOf(id, AOEngine::instance().getAOFolder())) && gSavedPerAccountSettings.getBOOL("LockAOFolders")) || - ((id == FSLSLBridge::instance().getBridgeFolder() || model->isObjectDescendentOf(id, FSLSLBridge::instance().getBridgeFolder())) - && gSavedPerAccountSettings.getBOOL("LockBridgeFolder")) - || ((id == FSFloaterWearableFavorites::getFavoritesFolder() || model->isObjectDescendentOf(id, FSFloaterWearableFavorites::getFavoritesFolder())) && gSavedPerAccountSettings.getBOOL("LockWearableFavoritesFolders")) ) @@ -994,9 +987,6 @@ bool get_is_category_renameable(const LLInventoryModel* model, const LLUUID& id) ((id == AOEngine::instance().getAOFolder() || model->isObjectDescendentOf(id, AOEngine::instance().getAOFolder())) && gSavedPerAccountSettings.getBOOL("LockAOFolders")) || - ((id == FSLSLBridge::instance().getBridgeFolder() || model->isObjectDescendentOf(id, FSLSLBridge::instance().getBridgeFolder())) - && gSavedPerAccountSettings.getBOOL("LockBridgeFolder")) - || ((id == FSFloaterWearableFavorites::getFavoritesFolder() || model->isObjectDescendentOf(id, FSFloaterWearableFavorites::getFavoritesFolder())) && gSavedPerAccountSettings.getBOOL("LockWearableFavoritesFolders")) ) diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp index 278705f3..a29851e1 100644 --- a/indra/newview/llinventorymodel.cpp +++ b/indra/newview/llinventorymodel.cpp @@ -87,7 +87,6 @@ #include "aoengine.h" #include "fsfloaterwearablefavorites.h" -#include "fslslbridge.h" #ifdef OPENSIM #include "llviewernetwork.h" #endif @@ -1929,8 +1928,6 @@ void LLInventoryModel::changeItemParent(LLViewerInventoryItem* item, // Locked folder if ((isObjectDescendentOf(item->getUUID(), AOEngine::instance().getAOFolder()) && gSavedPerAccountSettings.getBOOL("LockAOFolders")) || - (isObjectDescendentOf(item->getUUID(), FSLSLBridge::instance().getBridgeFolder()) - && gSavedPerAccountSettings.getBOOL("LockBridgeFolder")) || (isObjectDescendentOf(item->getUUID(), FSFloaterWearableFavorites::getFavoritesFolder()) && gSavedPerAccountSettings.getBOOL("LockWearableFavoritesFolders"))) { @@ -1971,8 +1968,6 @@ void LLInventoryModel::changeCategoryParent(LLViewerInventoryCategory* cat, // Protected folder if ((isObjectDescendentOf(cat->getUUID(), AOEngine::instance().getAOFolder()) && gSavedPerAccountSettings.getBOOL("LockAOFolders")) || - (isObjectDescendentOf(cat->getUUID(), FSLSLBridge::instance().getBridgeFolder()) - && gSavedPerAccountSettings.getBOOL("LockBridgeFolder")) || (isObjectDescendentOf(cat->getUUID(), FSFloaterWearableFavorites::getFavoritesFolder()) && gSavedPerAccountSettings.getBOOL("LockWearableFavoritesFolders"))) { @@ -4806,7 +4801,7 @@ void LLInventoryModel::wearAttachmentsOnAvatarCheckRemove(LLViewerObject *object } } - if (!isFound && att_id != FSLSLBridge::instance().getAttachedID()) + if (!isFound) { items_to_detach.push_back(att_id); } diff --git a/indra/newview/llpanelobjectinventory.cpp b/indra/newview/llpanelobjectinventory.cpp index df3f7bf5..d7b9b46c 100644 --- a/indra/newview/llpanelobjectinventory.cpp +++ b/indra/newview/llpanelobjectinventory.cpp @@ -1056,68 +1056,6 @@ public: //static bool enableIfCopyable( void* userdata ); }; -class LLTaskLSLBridge : public LLTaskScriptBridge -{ -public: - LLTaskLSLBridge(LLPanelObjectInventory* panel, - const LLUUID& uuid, - const std::string& name) : - LLTaskScriptBridge(panel, uuid, name) {} - - virtual bool canOpenItem() const { return true; } - virtual void openItem(); - virtual bool removeItem(); - //virtual void buildContextMenu(LLMenuGL& menu); - - //static void copyToInventory(void* userdata); -}; - -// virtual -void LLTaskLSLBridge::openItem() -{ - LL_INFOS() << "LLTaskLSLBridge::openItem() " << mUUID << LL_ENDL; - LLViewerObject* object = gObjectList.findObject(mPanel->getTaskUUID()); - if(!object || object->isInventoryPending()) - { - return; - } -// [RLVa:KB] - Checked: 2010-03-27 (RLVa-1.2.0b) | Modified: RLVa-1.1.0a - if ( (rlv_handler_t::isEnabled()) && (gRlvAttachmentLocks.isLockedAttachment(object->getRootEdit())) ) - { - RlvUtil::notifyBlockedViewXXX(LLAssetType::AT_SCRIPT); - return; - } -// [/RLVa:KB] - if (object->permModify() || gAgent.isGodlike()) - { - LLSD floater_key; - floater_key["taskid"] = mPanel->getTaskUUID(); - floater_key["itemid"] = mUUID; - - LLLiveLSLEditor* preview = LLFloaterReg::showTypedInstance("preview_scriptedit", floater_key, TAKE_FOCUS_YES); - if (preview) - { - LLSelectNode *node = LLSelectMgr::getInstance()->getSelection()->getFirstRootNode(NULL, true); - if (node && node->mValid) - { - preview->setObjectName(node->mName); - } - preview->setObjectID(mPanel->getTaskUUID()); - } - } - else - { - LLNotificationsUtil::add("CannotOpenScriptObjectNoMod"); - } -} - -// virtual -bool LLTaskLSLBridge::removeItem() -{ - LLFloaterReg::hideInstance("preview_scriptedit", LLSD(mUUID)); - return LLTaskInvFVBridge::removeItem(); -} - ///---------------------------------------------------------------------------- /// Class LLTaskObjectBridge ///---------------------------------------------------------------------------- @@ -1448,11 +1386,6 @@ LLTaskInvFVBridge* LLTaskInvFVBridge::createObjectBridge(LLPanelObjectInventory* object_id, object_name); break; - case LLAssetType::AT_LSL_TEXT: - new_bridge = new LLTaskLSLBridge(panel, - object_id, - object_name); - break; case LLAssetType::AT_SETTINGS: new_bridge = new LLTaskSettingsBridge(panel, object_id, diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index b73a5ef9..c72beeb1 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -238,7 +238,6 @@ #include "fsfloatersearch.h" #include "fsfloaterstreamtitle.h" #include "fsfloaterwearablefavorites.h" -#include "fslslbridge.h" #include "fsradar.h" #include "fsregistrarutils.h" #include "fsscriptlibrary.h" @@ -3221,20 +3220,6 @@ bool idle_startup() LLNotificationsUtil::add("FailedToGetBenefits", LLSD(), LLSD(), boost::bind(on_benefits_failed_callback, _1, _2)); } - // Client LSL Bridge - if (gSavedSettings.getBOOL("UseLSLBridge")) - { - if (!FSLSLBridge::instance().getBridgeCreating()) - { - FSLSLBridge::instance().initBridge(); - } - else - { - LL_INFOS("FSLSLBridge") << "LSL bridge already getting created - skipping bridge init" << LL_ENDL; - } - } - // - // Favorite Wearables FSFloaterWearableFavorites::initCategory(); diff --git a/indra/newview/llviewercontrol.cpp b/indra/newview/llviewercontrol.cpp index 8ee6d60c..6d0b9da9 100644 --- a/indra/newview/llviewercontrol.cpp +++ b/indra/newview/llviewercontrol.cpp @@ -102,7 +102,6 @@ #include "fsfloaternearbychat.h" #include "fsfloaterposestand.h" #include "fsfloaterteleporthistory.h" -#include "fslslbridge.h" #include "fsradar.h" #include "llavataractions.h" #include "lldiskcache.h" @@ -847,31 +846,6 @@ static void handleSetPoseStandLock(const LLSD& newvalue) } // Posestand Ground Lock -// Client LSL Bridge -static void handleFlightAssistOptionChanged(const LLSD& newvalue) -{ - FSLSLBridge::instance().viewerToLSL("UseLSLFlightAssist|" + newvalue.asString()); -} -// - -// Movelock for Bridge -static void handleMovelockOptionChanged(const LLSD& newvalue) -{ - FSLSLBridge::instance().updateBoolSettingValue("UseMoveLock", newvalue.asBoolean()); -} -static void handleMovelockAfterMoveOptionChanged(const LLSD& newvalue) -{ - FSLSLBridge::instance().updateBoolSettingValue("RelockMoveLockAfterMovement", newvalue.asBoolean()); -} -// - -// External integrations (OC, LM etc.) for Bridge -static void handleExternalIntegrationsOptionChanged() -{ - FSLSLBridge::instance().updateIntegrations(); -} -// - static void handleDecimalPrecisionChanged(const LLSD& newvalue) { LLFloaterTools* build_tools = LLFloaterReg::findTypedInstance("build"); @@ -1478,15 +1452,8 @@ void settings_setup_listeners() // Pose stand ground lock setting_setup_signal_listener(gSavedSettings, "FSPoseStandLock", handleSetPoseStandLock); - setting_setup_signal_listener(gSavedPerAccountSettings, "UseLSLFlightAssist", handleFlightAssistOptionChanged); - setting_setup_signal_listener(gSavedPerAccountSettings, "UseMoveLock", handleMovelockOptionChanged); - setting_setup_signal_listener(gSavedPerAccountSettings, "RelockMoveLockAfterMovement", handleMovelockAfterMoveOptionChanged); setting_setup_signal_listener(gSavedSettings, "FSBuildToolDecimalPrecision", handleDecimalPrecisionChanged); - // External integrations (OC, LM etc.) for Bridge - setting_setup_signal_listener(gSavedPerAccountSettings, "BridgeIntegrationOC", handleExternalIntegrationsOptionChanged); - setting_setup_signal_listener(gSavedPerAccountSettings, "BridgeIntegrationLM", handleExternalIntegrationsOptionChanged); - setting_setup_signal_listener(gSavedSettings, "FSNameTagShowLegacyUsernames", handleUsernameFormatOptionChanged); setting_setup_signal_listener(gSavedSettings, "FSTrimLegacyNames", handleLegacyTrimOptionChanged); diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index dbba6566..6222ca91 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -162,7 +162,6 @@ // Firestorm includes #include "fsassetblacklist.h" #include "fsdata.h" -#include "fslslbridge.h" #include "fscommon.h" #include "fsfloaterexport.h" #include "fsfloatercontacts.h" @@ -5149,85 +5148,6 @@ class FSSelfCheckForceSit : public view_listener_t } }; -// Phantom mode -KC & -class FSSelfToggleMoveLock : public view_listener_t -{ - bool handleEvent(const LLSD& userdata) - { - if (LLGridManager::getInstance()->isInSecondLife()) - { - make_ui_sound("UISndMovelockToggle"); - bool new_value = !gSavedPerAccountSettings.getBOOL("UseMoveLock"); - gSavedPerAccountSettings.setBOOL("UseMoveLock", new_value); - if (new_value) - { - LLNotificationsUtil::add("MovelockEnabling", LLSD()); - } - else - { - LLNotificationsUtil::add("MovelockDisabling", LLSD()); - } - } -#ifdef OPENSIM - else - { - gAgent.togglePhantom(); - } -#endif // OPENSIM - //TODO: feedback to local chat - return true; - } -}; - - -class FSSelfCheckMoveLock : public view_listener_t -{ - bool handleEvent(const LLSD& userdata) - { - bool new_value(false); - if (LLGridManager::getInstance()->isInSecondLife()) - { - new_value = gSavedPerAccountSettings.getBOOL("UseMoveLock"); - // prevents having Move Lock activated but disabled when for some reason the LSL Bridge is not worn or not ready - if (new_value && !enable_bridge_function()) - { - gSavedPerAccountSettings.setBOOL("UseMoveLock", false); - new_value = false; - } - // - } -#ifdef OPENSIM - else - { - new_value = gAgent.getPhantom(); - } -#endif // OPENSIM - return new_value; - } -}; - -bool enable_bridge_function() -{ - return FSLSLBridge::instance().canUseBridge(); -} - -bool enable_move_lock() -{ -#ifdef OPENSIM - // Phantom mode always works on opensim, at least right now. - if (LLGridManager::getInstance()->isInOpenSim()) - return true; -#endif // OPENSIM - return enable_bridge_function(); -} - -bool enable_script_info() -{ - return (!LLSelectMgr::getInstance()->getSelection()->isEmpty() - && enable_bridge_function()); -} -// - // [SJ - Adding IgnorePrejump in Menu ] class FSSelfToggleIgnorePreJump : public view_listener_t { @@ -7999,7 +7919,7 @@ void handle_script_info() { object_id = LLSelectMgr::getInstance()->getSelection()->getPrimaryObject()->mID; LL_INFOS() << "Reporting Script Info for object: " << object_id.asString() << LL_ENDL; - FSLSLBridge::instance().viewerToLSL("getScriptInfo|" + object_id.asString() + "|" + (gSavedSettings.getBOOL("FSScriptInfoExtended") ? "1" : "0")); + //FSLSLBridge::instance().viewerToLSL("getScriptInfo|" + object_id.asString() + "|" + (gSavedSettings.getBOOL("FSScriptInfoExtended") ? "1" : "0")); } } @@ -8500,11 +8420,6 @@ void handle_buy_currency() LLBuyCurrencyHTML::openCurrencyFloater(); } -void handle_recreate_lsl_bridge() -{ - FSLSLBridge::instance().recreateBridge(); -} - class LLFloaterVisible : public view_listener_t { bool handleEvent(const LLSD& userdata) @@ -9193,10 +9108,6 @@ static bool onEnableAttachmentLabel(LLUICtrl* ctrl, const LLSD& data) if (attached_object) { LLViewerInventoryItem* itemp = gInventory.getItem(attached_object->getAttachmentItemID()); - // Hide bridge from attach to HUD menus - //if (itemp) - if (itemp && !(FSLSLBridge::instance().getBridge() && FSLSLBridge::instance().getBridge()->getUUID() == itemp->getUUID() && data["index"].asInteger() == FS_BRIDGE_POINT)) - // { label += std::string(" (") + itemp->getName() + std::string(")"); break; @@ -12510,9 +12421,6 @@ void initialize_menus() commit.add("EditShape", boost::bind(&handle_edit_shape)); commit.add("HoverHeight", boost::bind(&handle_hover_height)); commit.add("EditPhysics", boost::bind(&handle_edit_physics)); - // Client LSL Bridge - commit.add("RecreateLSLBridge", boost::bind(&handle_recreate_lsl_bridge)); - // // View menu view_listener_t::addMenu(new LLViewMouselook(), "View.Mouselook"); @@ -12904,9 +12812,6 @@ void initialize_menus() view_listener_t::addMenu(new FSSelfForceSit(), "Self.ForceSit"); //KC enable.add("Self.EnableForceSit", boost::bind(&enable_forcesit_self)); //KC view_listener_t::addMenu(new FSSelfCheckForceSit(), "Self.getForceSit"); //KC - view_listener_t::addMenu(new FSSelfToggleMoveLock(), "Self.ToggleMoveLock"); //KC - view_listener_t::addMenu(new FSSelfCheckMoveLock(), "Self.GetMoveLock"); //KC - enable.add("Self.EnableMoveLock", boost::bind(&enable_move_lock)); // view_listener_t::addMenu(new FSSelfToggleIgnorePreJump(), "Self.toggleIgnorePreJump"); //SJ view_listener_t::addMenu(new FSSelfCheckIgnorePreJump(), "Self.getIgnorePreJump"); //SJ view_listener_t::addMenu(new LLSelfRemoveAllAttachments(), "Self.RemoveAllAttachments"); @@ -13009,7 +12914,6 @@ void initialize_menus() enable.add("Object.EnableUnmute", boost::bind(&enable_object_unmute)); enable.add("Object.EnableBuy", boost::bind(&enable_buy_object)); commit.add("Object.ZoomIn", boost::bind(&handle_look_at_selection, "zoom")); - enable.add("Object.EnableScriptInfo", boost::bind(&enable_script_info)); // enable.add("Object.EnableShowOriginal", boost::bind(&enable_object_show_original)); // Disable if prevented by RLVa @@ -13077,7 +12981,6 @@ void initialize_menus() enable.add("EnableGLTFSaveAs", boost::bind(&enable_gltf_save_as)); enable.add("EnableGLTFUpload", boost::bind(&enable_gltf_upload)); enable.add("EnableTerrainLocalPaintMap", std::bind(&enable_terrain_local_paintmap)); - enable.add("EnableBridgeFunction", boost::bind(&enable_bridge_function)); // view_listener_t::addMenu(new LLFloaterVisible(), "FloaterVisible"); view_listener_t::addMenu(new LLSomethingSelected(), "SomethingSelected"); diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 91792f18..56915e99 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -145,7 +145,6 @@ #include "fsfloaterplacedetails.h" #include "fsradar.h" #include "fskeywords.h" // FIRE-10178: Keyword Alerts in group IM do not work unless the group is in the foreground -#include "fslslbridge.h" #include "fsmoneytracker.h" #include "llattachmentsmgr.h" #include "lleconomy.h" @@ -3098,14 +3097,6 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data) chat.mText = LLTrans::getString("whisper") + " "; break; case CHAT_TYPE_OWNER: - // Client LSL Bridge - { - if (FSLSLBridge::instance().lslToViewer(mesg, from_id, owner_id)) - { - return; - } - } - // // cmdline packager if (cmdline_packager(mesg, from_id, owner_id)) @@ -7653,11 +7644,7 @@ void process_teleport_failed(LLMessageSystem *msg, void**) gAgent.stopTyping(); LL_INFOS() << "Teleport error, message_id=" << message_id << LL_ENDL; - if (!FSLSLBridge::instance().canUseBridge() || - (message_id != "Could not teleport closer to destination")) - { - LLNotificationsUtil::add("CouldNotTeleportReason", args); - } + LLNotificationsUtil::add("CouldNotTeleportReason", args); if( gAgent.getTeleportState() != LLAgent::TELEPORT_NONE ) { diff --git a/indra/newview/llviewernetwork.cpp b/indra/newview/llviewernetwork.cpp index 2506d3fc..966f6563 100644 --- a/indra/newview/llviewernetwork.cpp +++ b/indra/newview/llviewernetwork.cpp @@ -62,7 +62,7 @@ const std::string GRID_LOGIN_IDENTIFIER_TYPES = "login_identifier_types"; const std::string GRID_SLURL_BASE = "slurl_base"; const std::string GRID_APP_SLURL_BASE = "app_slurl_base"; -const std::string DEFAULT_LOGIN_PAGE = "https://phoenixviewer.com/app/loginV3/"; +const std::string DEFAULT_LOGIN_PAGE = "https://viewer-splash.secondlife.com/"; const std::string MAIN_GRID_LOGIN_URI = "https://login.agni.lindenlab.com/cgi-bin/login.cgi"; diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index e5fe30c1..7220e28c 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -495,7 +495,6 @@ public: static const std::string beacon_sun = LLTrans::getString("BeaconSun"); static const std::string beacon_moon = LLTrans::getString("BeaconMoon"); static const std::string particle_hiding = LLTrans::getString("ParticleHiding"); - static const std::string movelock_enabled = LLTrans::getString("MovelockEnabled"); // FIRE-29880: Movelock // Draw the statistics in a light gray // and in a thin font @@ -870,16 +869,6 @@ public: ypos += y_inc; } - // FIRE-29880: Movelock - static LLCachedControl fsRenderMovelockState(gSavedPerAccountSettings, "UseMoveLock"); - static LLCachedControl fsRenderMovelockText(gSavedPerAccountSettings, "MoveLockInfoVisibleOnScreen"); - if (fsRenderMovelockState && fsRenderMovelockText) - { - addText(xpos, ypos, movelock_enabled); - ypos += y_inc; - } - // - // only display these messages if we are actually rendering beacons at this moment // Always show the beacon text regardless if the floater is visible // ...and if we want to see it diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 135bbe14..887f97f5 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -133,7 +133,6 @@ #include "llviewernetwork.h" // [FS:CR] isInSecondlife() #include "llsidepanelappearance.h" #include "fsavatarrenderpersistence.h" -#include "fslslbridge.h" // Movelock position refresh #include "fsdiscordconnect.h" // tapping a place that happens on landing in world to start up discord @@ -8894,12 +8893,6 @@ void LLVOAvatar::sitDown(bool bSitting) } // [/RLVa:KB] - // Refresh movelock position after sitting down to prevent pulling avatar back to previous one after standing up - if (bSitting && gSavedPerAccountSettings.getBOOL("UseMoveLock") && gSavedPerAccountSettings.getBOOL("RelockMoveLockAfterMovement")) - { - FSLSLBridge::instance().viewerToLSL("UseMoveLock|1|noreport"); - } - // } } diff --git a/indra/newview/llvoavatarself.cpp b/indra/newview/llvoavatarself.cpp index 9dae1846..b2023ff4 100644 --- a/indra/newview/llvoavatarself.cpp +++ b/indra/newview/llvoavatarself.cpp @@ -63,7 +63,6 @@ #include "lluiusage.h" // Firestorm includes -#include "fslslbridge.h" #include "lggbeammaps.h" #include "piemenu.h" #include "pieslice.h" @@ -1664,16 +1663,6 @@ const LLViewerJointAttachment *LLVOAvatarSelf::attachObject(LLViewerObject *view // ReplaceWornItemsOnly gInventory.wearAttachmentsOnAvatarCheckRemove(viewer_object, attachment); // - // Client LSL Bridge - if (attachment->getName() == FS_BRIDGE_ATTACHMENT_POINT_NAME && gSavedSettings.getBOOL("UseLSLBridge")) - { - LLViewerInventoryItem* inv_object = gInventory.getItem(viewer_object->getAttachmentItemID()); - if (inv_object && inv_object->getName() == FSLSLBridge::instance().currentFullName()) - { - FSLSLBridge::instance().processAttach(viewer_object, attachment); - } - } - // updateLODRiggedAttachments(); // [RLVa:KB] - Checked: 2010-08-22 (RLVa-1.2.1a) | Modified: RLVa-1.2.1a @@ -1728,16 +1717,6 @@ bool LLVOAvatarSelf::detachObject(LLViewerObject *viewer_object) (*mAttachmentSignal)(viewer_object, pAttachPt, ACTION_DETACH); } - // Client LSL Bridge - if (pAttachPt->getName() == FS_BRIDGE_ATTACHMENT_POINT_NAME) - { - LLViewerInventoryItem* inv_object = gInventory.getItem(viewer_object->getAttachmentItemID()); - if (inv_object && inv_object->getName() == FSLSLBridge::instance().currentFullName()) - { - FSLSLBridge::instance().processDetach(viewer_object, pAttachPt); - } - } - // break; } } @@ -1811,10 +1790,6 @@ bool LLVOAvatarSelf::detachAttachmentIntoInventory(const LLUUID &item_id) { LLInventoryItem* item = gInventory.getItem(item_id); // if (item) -// [RLVa:KB] - Checked: 2010-09-04 (RLVa-1.2.1c) | Added: RLVa-1.2.1c - if ( (item) && (((!rlv_handler_t::isEnabled()) || (gRlvAttachmentLocks.canDetach(item))) || - FSLSLBridge::instance().canDetach(item->getUUID())) ) -// [/RLVa:KB] { gMessageSystem->newMessageFast(_PREHASH_DetachAttachmentIntoInv); gMessageSystem->nextBlockFast(_PREHASH_ObjectData); diff --git a/indra/newview/rlvhandler.cpp b/indra/newview/rlvhandler.cpp index 0552637c..bbf78d1b 100644 --- a/indra/newview/rlvhandler.cpp +++ b/indra/newview/rlvhandler.cpp @@ -72,7 +72,6 @@ // [FS communication UI] #include "fsfloatervoicecontrols.h" // [FS communication UI] -#include "fslslbridge.h" #include "fsradar.h" // Boost includes @@ -3635,8 +3634,7 @@ ERlvCmdRet RlvHandler::onGetAttach(const RlvCommand& rlvCmd, std::string& strRep if ( (0 == idxAttachPt) || (itAttach->first == idxAttachPt) ) { // Ansa: Do not include the bridge when checking for number of objects - S32 bridge_correct = (pAttachPt->getName() == FS_BRIDGE_ATTACHMENT_POINT_NAME && FSLSLBridge::instance().isBridgeValid()) ? 1 : 0; - bool fWorn = ((pAttachPt->getNumObjects() - bridge_correct) > 0) && + bool fWorn = (pAttachPt->getNumObjects() > 0) && ( (!RlvSettings::getHideLockedAttach()) || (RlvForceWear::isForceDetachable(pAttachPt, true, rlvCmd.getObjectID())) ); strReply.push_back( (fWorn) ? '1' : '0' ); } @@ -3665,10 +3663,8 @@ ERlvCmdRet RlvHandler::onGetAttachNames(const RlvCommand& rlvCmd, std::string& s switch (rlvCmd.getBehaviourType()) { case RLV_BHVR_GETATTACHNAMES: // Every attachment point that has an attached object - // Ansa: Do not include the bridge when checking for number of objects { - S32 bridge_correct = ((pAttachPt->getName() == FS_BRIDGE_ATTACHMENT_POINT_NAME && FSLSLBridge::instance().isBridgeValid()) ? 1 : 0); - fAdd = ((pAttachPt->getNumObjects() - bridge_correct) > 0); + fAdd = (pAttachPt->getNumObjects() > 0); } break; case RLV_BHVR_GETADDATTACHNAMES: // Every attachment point that can be attached to (wear replace OR wear add) diff --git a/indra/newview/rlvhelper.cpp b/indra/newview/rlvhelper.cpp index 2599dfbf..ebb979ea 100644 --- a/indra/newview/rlvhelper.cpp +++ b/indra/newview/rlvhelper.cpp @@ -23,10 +23,6 @@ #include "llviewerobjectlist.h" #include "pipeline.h" -// FIRE-4453 bridge detached by the RLV command @remattach=force -#include "fslslbridge.h" -// FIRE-4453 - #include "rlvcommon.h" #include "rlveffects.h" #include "rlvhelper.h" @@ -1416,9 +1412,6 @@ bool RlvForceWear::isForceDetachable(const LLViewerObject* pAttachObj, bool fChe && ( (idExcept.isNull()) ? (!gRlvAttachmentLocks.isLockedAttachment(pAttachObj)) : (!gRlvAttachmentLocks.isLockedAttachmentExcept(pAttachObj, idExcept)) ) && (isStrippable(pAttachObj->getAttachmentItemID())) - // FIRE-4453 bridge detached by the RLV command @remattach=force - && (pAttachObj->getID() != FSLSLBridge::instance().getAttachedID()) - // FIRE-4453 #ifdef RLV_EXPERIMENTAL_COMPOSITEFOLDERS && ( (!fCheckComposite) || (!RlvSettings::getEnableComposites()) || (!gRlvHandler.getCompositeInfo(pAttachPt->getItemID(), NULL, &pFolder)) || (gRlvHandler.canTakeOffComposite(pFolder)) ) diff --git a/indra/newview/rlvlocks.cpp b/indra/newview/rlvlocks.cpp index 89c596eb..6bca36ae 100644 --- a/indra/newview/rlvlocks.cpp +++ b/indra/newview/rlvlocks.cpp @@ -15,7 +15,6 @@ */ #include "llviewerprecompiledheaders.h" -#include "fslslbridge.h" #include "llagent.h" #include "llappearancemgr.h" #include "llattachmentsmgr.h" @@ -659,13 +658,6 @@ void RlvAttachmentLockWatchdog::onDetach(const LLViewerObject* pAttachObj, const if ( (!idxAttachPt) || (idAttachItem.isNull()) ) return; - // Bridge can always be detached - if (FSLSLBridge::instance().canDetach(idAttachItem)) - { - return; - } - // - // If it's an attachment that's pending force-detach then we don't want to do anything (even if it's currently "remove locked") rlv_detach_map_t::iterator itDetach = std::find(m_PendingDetach.begin(), m_PendingDetach.end(), idAttachItem); if (itDetach != m_PendingDetach.end()) diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index 250474db..5cade89f 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -873,7 +873,6 @@ with the same filename but different name - diff --git a/indra/newview/skins/default/textures/windows/login_pm_logo.png b/indra/newview/skins/default/textures/windows/login_pm_logo.png index e193a1f2..4bca35fc 100644 Binary files a/indra/newview/skins/default/textures/windows/login_pm_logo.png and b/indra/newview/skins/default/textures/windows/login_pm_logo.png differ diff --git a/indra/newview/skins/default/xui/en/floater_top_objects.xml b/indra/newview/skins/default/xui/en/floater_top_objects.xml index 6251f135..ccec7b5e 100644 --- a/indra/newview/skins/default/xui/en/floater_top_objects.xml +++ b/indra/newview/skins/default/xui/en/floater_top_objects.xml @@ -298,19 +298,6 @@ - - - - 360° Snapshot Snapshot to Disk Radar Conversation Log - Movelock Block List Resync animations Region Tracker @@ -2919,7 +2918,6 @@ name="Command_360_Capture_Tooltip">Capture a 360° equirectangular image[NAME] hit you with a physical object. [NAME] caused a collision of unknown type. - Avatar > Movement > Movelock is enabled busy response diff --git a/indra/newview/skins/default/xui/es/notifications.xml b/indra/newview/skins/default/xui/es/notifications.xml index a85991d1..422c54fa 100644 --- a/indra/newview/skins/default/xui/es/notifications.xml +++ b/indra/newview/skins/default/xui/es/notifications.xml @@ -4738,12 +4738,6 @@ El nombre NO puede contener los caracteres ":" o "|". Modo fantasma desactivado. - - Bloqueo de movimiento activado. - - - Bloqueo de movimiento desactivado. - Restablecer todas las configuraciones puede ser útil si estás experimentando problemas, aunque tendrás que repetir todas las personalizaciones que hayas podido hacer a la configuración por defecto. diff --git a/indra/newview/skins/default/xui/es/panel_preferences_firestorm.xml b/indra/newview/skins/default/xui/es/panel_preferences_firestorm.xml index 1bb87835..ec4b787f 100644 --- a/indra/newview/skins/default/xui/es/panel_preferences_firestorm.xml +++ b/indra/newview/skins/default/xui/es/panel_preferences_firestorm.xml @@ -13,8 +13,6 @@ - - diff --git a/indra/newview/skins/default/xui/es/panel_preferences_move.xml b/indra/newview/skins/default/xui/es/panel_preferences_move.xml index 695344f1..1c967f8f 100644 --- a/indra/newview/skins/default/xui/es/panel_preferences_move.xml +++ b/indra/newview/skins/default/xui/es/panel_preferences_move.xml @@ -42,7 +42,6 @@ - Un solo clic en el terreno: diff --git a/indra/newview/skins/default/xui/es/strings.xml b/indra/newview/skins/default/xui/es/strings.xml index 891514a0..c083bc90 100644 --- a/indra/newview/skins/default/xui/es/strings.xml +++ b/indra/newview/skins/default/xui/es/strings.xml @@ -5939,7 +5939,6 @@ Inténtalo incluyendo la ruta de acceso al editor entre comillas [NAME] te ha golpeado con un objeto con scripts. [NAME] te ha golpeado con un objeto físico. [NAME] ha causado una colisión de tipo desconocido. - Avatar > Movimiento > Bloquear activado respuesta de ocupado El residente no puede visitar esta región. diff --git a/indra/newview/skins/default/xui/it/strings.xml b/indra/newview/skins/default/xui/it/strings.xml index 05a57276..ffd49c7b 100644 --- a/indra/newview/skins/default/xui/it/strings.xml +++ b/indra/newview/skins/default/xui/it/strings.xml @@ -5948,9 +5948,6 @@ Prova a racchiudere il percorso dell'editor in doppie virgolette. [NAME] ha causato una collisione sconosciuta. - - Io > Movimento > Blocca attivo - busy response diff --git a/indra/newview/skins/starlight/textures/textures.xml b/indra/newview/skins/starlight/textures/textures.xml index dd8ffeb6..070ca890 100755 --- a/indra/newview/skins/starlight/textures/textures.xml +++ b/indra/newview/skins/starlight/textures/textures.xml @@ -919,7 +919,6 @@ with the same filename but different name - diff --git a/indra/newview/skins/starlight/xui/en/panel_fs_login.xml b/indra/newview/skins/starlight/xui/en/panel_fs_login.xml index 19e495a2..127e08d2 100644 --- a/indra/newview/skins/starlight/xui/en/panel_fs_login.xml +++ b/indra/newview/skins/starlight/xui/en/panel_fs_login.xml @@ -12,10 +12,10 @@ width="1024"> - https://phoenixviewer.com/app/loginV3/ + https://viewer-splash.secondlife.com/ - http://secondlife.eniac15.lindenlab.com/reg-in-client/ + http://ayudavirtual.org/unirseasl/ diff --git a/indra/newview/skins/starlightcui/textures/textures.xml b/indra/newview/skins/starlightcui/textures/textures.xml index 8927775d..46ce1996 100755 --- a/indra/newview/skins/starlightcui/textures/textures.xml +++ b/indra/newview/skins/starlightcui/textures/textures.xml @@ -919,7 +919,6 @@ with the same filename but different name - diff --git a/indra/newview/skins/starlightcui/xui/en/panel_fs_login.xml b/indra/newview/skins/starlightcui/xui/en/panel_fs_login.xml index 8914aad9..d8ca2eab 100644 --- a/indra/newview/skins/starlightcui/xui/en/panel_fs_login.xml +++ b/indra/newview/skins/starlightcui/xui/en/panel_fs_login.xml @@ -12,10 +12,10 @@ width="1024"> - https://phoenixviewer.com/app/loginV3/ + https://viewer-splash.secondlife.com/ - http://secondlife.eniac15.lindenlab.com/reg-in-client/ + https://ayudavirtual.org/unirseasl/