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

Conflicts:
	indra/newview/lldrawpoolwlsky.cpp
This commit is contained in:
Inusaito Sayori
2015-06-19 05:42:49 -04:00
634 changed files with 8198 additions and 12212 deletions

View File

@@ -397,7 +397,7 @@ void LLHUDText::updateVisibility()
if (!mSourceObject)
{
//llwarns << "LLHUDText::updateScreenPos -- mSourceObject is NULL!" << llendl;
//LL_WARNS() << "LLHUDText::updateScreenPos -- mSourceObject is NULL!" << LL_ENDL;
mVisible = TRUE;
if (mOnHUDAttachment)
{