Damian/Puma_Viewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Quitado código del LSL bridge y funciones dependientes

Browse Source 
Corrección de errores previos en la migración.
Cambiada la pantalla de inicio (Splash Screen)
This commit is contained in:
Damian
2025-05-26 06:28:46 -03:00
parent a5d5fe6288
commit 32da2fd0fb
55 changed files with 1001 additions and 1029 deletions
Download Patch File Download Diff File Expand all files Collapse all files
indra/newview/llagent.cpp
+1 -65
View File
@@ -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
//---------------------------------------------------------------------------
// <FS:TT> 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)
{
// <FS:Beq> 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);
}
// </FS:Beq>
LLVector3 pos_local = (LLVector3)(pos_global - from_region_handle(region_handle));
return teleportBridgeLocal(pos_local);
}
// </FS:TT> Client LSL Bridge
// teleportCore() - stuff to do on any teleport
// protected
@@ -5424,12 +5386,6 @@ void LLAgent::doTeleportViaLocation(const LLVector3d& pos_global)
<< LL_ENDL;
// </FS:Beq>
}
// <FS:TT> Client LSL Bridge
if (FSLSLBridge::instance().canUseBridge() && is_local)
{
teleportBridgeGlobal(pos_global);
}
// </FS:TT>
}
// 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);
// // <FS:TT> Client LSL Bridge
// if (FSLSLBridge::instance().canUseBridge())
// {
// if (region_handle == to_region_handle(getPositionGlobal()))
// {
// teleportBridgeLocal(pos_local);
// }
// }
// // </FS:TT>
// }
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);
// <FS:TT> Client LSL Bridge
if ( FSLSLBridge::instance().canUseBridge() )
{
// refresh regionp
regionp = getRegion();
if( regionp && ( region_handle == regionp->getHandle() ) )
{
teleportBridgeLocal(pos_within_target_region);
}
}
// </FS:TT>
}
// </FS:Beq>
LLAgent::ETeleportState LLAgent::getTeleportState() const
@@ -6101,7 +6037,7 @@ void LLAgent::renderAutoPilotTarget()
// <FS> Phantom mode
void LLAgent::togglePhantom()
{
make_ui_sound("UISndMovelockToggle");
// make_ui_sound("UISndMovelockToggle");
mPhantom = !mPhantom;
if (mPhantom)
{