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

6
indra/newview/llpanelgroupgeneral.cpp
View File

@@ -116,7 +116,7 @@ LLPanelGroupGeneral::~LLPanelGroupGeneral()
BOOL LLPanelGroupGeneral::postBuild()
{
llinfos << "LLPanelGroupGeneral::postBuild()" << llendl;
LL_INFOS() << "LLPanelGroupGeneral::postBuild()" << LL_ENDL;
bool recurse = true;
@@ -375,7 +375,7 @@ bool LLPanelGroupGeneral::apply(std::string& mesg)
if (has_power_in_group || mGroupID.isNull())
{
llinfos << "LLPanelGroupGeneral::apply" << llendl;
LL_INFOS() << "LLPanelGroupGeneral::apply" << LL_ENDL;
// Check to make sure mature has been set
if(mComboMature &&
@@ -843,7 +843,7 @@ void LLPanelGroupGeneral::updateMembers()
if (mMemberProgress == gdatap->mMembers.end())
{
lldebugs << " member list completed." << llendl;
LL_DEBUGS() << " member list completed." << LL_ENDL;
mListVisibleMembers->setEnabled(TRUE);
}
else