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

@@ -97,7 +97,7 @@ LLPrefsAscentSys::~LLPrefsAscentSys()
void LLPrefsAscentSys::onCommitCheckBox(LLUICtrl* ctrl, const LLSD& value)
{
// llinfos << "Change to " << ctrl->getControlName() << " aka " << ctrl->getName() << llendl;
// LL_INFOS() << "Change to " << ctrl->getControlName() << " aka " << ctrl->getName() << LL_ENDL;
const std::string name = ctrl->getName();
bool enabled = value.asBoolean();