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

Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer into Cupcake

Browse Source 
Conflicts:
	indra/newview/llappviewer.cpp
This commit is contained in:
Drake Arconis
2013-03-20 08:31:04 -04:00
parent 20cdb35172 4be1d057bc
commit 0eeddb0607
14 changed files with 168 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llcommon/llsingleton.h
View File

@@ -226,7 +226,7 @@ void LLSingleton<DERIVED_TYPE>::createInstance(SingletonInstanceData& data)
if (data.mInitState == INITIALIZING)
{
lldebugs << "Tried to access singleton " << typeid(DERIVED_TYPE).name() << " from initSingleton(), using half-initialized object" << llendl;
llerrs << "Tried to access singleton " << typeid(DERIVED_TYPE).name() << " from initSingleton(), using half-initialized object" << llendl;
return;
}