Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'animesh' of git://github.com/Shyotl/SingularityViewer

Browse Source 
# Conflicts:
#	indra/llcommon/llstring.h
#	indra/newview/llviewermenu.cpp
#	indra/newview/llviewerregion.cpp
This commit is contained in:
Lirusaito
2019-03-18 17:30:34 -04:00
parent d235e045d8 e0194d4d06
commit c5329968f7
101 changed files with 7625 additions and 2526 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
indra/newview/llagent.cpp
View File

@@ -935,6 +935,16 @@ void LLAgent::setRegion(LLViewerRegion *regionp)
{
gSky.mVOGroundp->setRegion(regionp);
}
if (regionp->capabilitiesReceived())
{
regionp->requestSimulatorFeatures();
}
else
{
regionp->setCapabilitiesReceivedCallback(boost::bind(&LLViewerRegion::requestSimulatorFeatures, regionp));
}
}
else
{
@@ -4003,12 +4013,16 @@ bool LLAgent::teleportCore(bool is_local)
gTeleportDisplay = TRUE;
gAgent.setTeleportState( LLAgent::TELEPORT_START );
/*static const LLCachedControl<bool> hide_tp_screen("AscentDisableTeleportScreens",false);
if(!hide_tp_screen)
static const LLCachedControl<bool> hide_tp_screen("AscentDisableTeleportScreens",false);
static const LLCachedControl<bool> skip_reset_objects_on_teleport("SHSkipResetVBOsOnTeleport", false);
if(!hide_tp_screen && !skip_reset_objects_on_teleport)
{
// AscentDisableTeleportScreens TRUE might be broken..*/
//release geometry from old location
gPipeline.resetVertexBuffers();
}*/
LLSpatialPartition::sTeleportRequested = TRUE;
}
if (gSavedSettings.getBOOL("SpeedRez"))
{
@@ -4485,8 +4499,7 @@ void LLAgent::stopCurrentAnimations()
// re-assert at least the default standing animation, because
// viewers get confused by avs with no associated anims.
sendAnimationRequest(ANIM_AGENT_STAND,
ANIM_REQUEST_START);
sendAnimationRequest(ANIM_AGENT_STAND, ANIM_REQUEST_START);
}
}