Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
Conflicts: indra/newview/lldrawpoolwlsky.cpp
This commit is contained in:
@@ -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)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user