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

Merge branch 'master' into sunshine

Browse Source 
Conflicts:
	indra/llimage/llimage.cpp
	indra/llui/llui.cpp
	indra/newview/llvoavatar.cpp
This commit is contained in:
Shyotl
2013-01-08 17:05:29 -06:00
parent c5c1294d7d 17e0c79fe7
commit 54771409d6
1085 changed files with 11207 additions and 4376 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
indra/newview/llappviewer.cpp
View File

@@ -3974,7 +3974,8 @@ void LLAppViewer::idle()
}
static const LLCachedControl<bool> hide_tp_screen("AscentDisableTeleportScreens",false);
if (!hide_tp_screen && gAgent.getTeleportState() != LLAgent::TELEPORT_NONE && gAgent.getTeleportState() != LLAgent::TELEPORT_LOCAL)
LLAgent::ETeleportState tp_state = gAgent.getTeleportState();
if (!hide_tp_screen && tp_state != LLAgent::TELEPORT_NONE && tp_state != LLAgent::TELEPORT_LOCAL && tp_state != LLAgent::TELEPORT_PENDING)
{
return;
}