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

Client-side maturity handling when teleporting. Adds new notification that asks if you want to change maturity settings with a single click and automatically re-fire the teleport request.

Browse Source
This commit is contained in:
Shyotl
2012-12-25 02:30:51 -06:00
parent f8a6e2e19f
commit 3ca39ab3f1
13 changed files with 1447 additions and 270 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llviewertexturelist.cpp
View File

@@ -631,7 +631,7 @@ void LLViewerTextureList::updateImages(F32 max_time)
//Can't check gTeleportDisplay due to a process_teleport_local(), which sets it to true for local teleports... so:
// Do this case if IS teleporting but NOT local teleporting, AND either the TP screen is set to appear OR we just entered the sim (TELEPORT_START_ARRIVAL)
LLAgent::ETeleportState state = gAgent.getTeleportState();
if(state != LLAgent::TELEPORT_NONE && state != LLAgent::TELEPORT_LOCAL &&
if(state != LLAgent::TELEPORT_NONE && state != LLAgent::TELEPORT_LOCAL && state != LLAgent::TELEPORT_PENDING &&
(!hide_tp_screen || state == LLAgent::TELEPORT_START_ARRIVAL || state == LLAgent::TELEPORT_ARRIVING))
{
if(!cleared)