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

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

Browse Source 
Conflicts:
	indra/llmessage/llurlrequest.cpp
	indra/newview/llvoavatar.cpp
This commit is contained in:
Siana Gearz
2012-11-12 06:46:58 +01:00
parent 59d4d833f1 d518222340
commit 303c74f4c9
200 changed files with 19362 additions and 3255 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llwindow/llwindowsdl.cpp
View File

@@ -1914,7 +1914,7 @@ void LLWindowSDL::gatherInput()
mIsMinimized = (!event.active.gain);
mCallbacks->handleActivate(this, !mIsMinimized);
llinfos << "SDL deiconification state switched to " << BOOL(event.active.gain) << llendl;
lldebugs << "SDL deiconification state switched to " << BOOL(event.active.gain) << llendl;
}
else
{