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

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

Browse Source 
Conflicts:
	indra/newview/lldrawpoolwlsky.cpp
This commit is contained in:
Inusaito Sayori
2015-06-19 05:42:49 -04:00
parent 2bd2a7a64b 1c627317ec
commit b11511b7b9
634 changed files with 8198 additions and 12212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llnotify.cpp
View File

@@ -361,7 +361,7 @@ LLNotifyBox::LLNotifyBox(LLNotificationPtr notification)
}
if (++sNotifyBoxCount <= 0)
llwarns << "A notification was mishandled. sNotifyBoxCount = " << sNotifyBoxCount << llendl;
LL_WARNS() << "A notification was mishandled. sNotifyBoxCount = " << sNotifyBoxCount << LL_ENDL;
// If this is the only notify box, don't show the next button
else if (sNotifyBoxCount == 1 && mNextBtn)
mNextBtn->setVisible(false);