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

Merge remote-tracking branch 'lirusaito/master'

Browse Source 
Conflicts:
	indra/newview/llviewermessage.cpp
	indra/newview/skins/default/xui/fr/panel_preferences_ascent_chat.xml
	indra/newview/skins/default/xui/fr/panel_preferences_general.xml
This commit is contained in:
Latif Khalifa
2013-04-23 12:17:08 +02:00
parent 5396d17f2a 2b3350d686
commit e0077b6941
43 changed files with 3042 additions and 3219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
indra/newview/pipeline.cpp
View File

@@ -4732,11 +4732,6 @@ void LLPipeline::rebuildPools()
}
max_count--;
}
if (isAgentAvatarValid())
{
gAgentAvatarp->rebuildHUD();
}
}
void LLPipeline::addToQuickLookup( LLDrawPool* new_poolp )