Fix compile errors and warnings on linux after merging Shyotl.
Fix linker errors on linux after merging Shyotl
Minor cleanup.
Merge branch 'master' into osx_testing
Revert "Migrated gl matrix stack to LLMatrix4a"

This reverts commit 061178ad827067e08ab4d847e9b5140a612499b1.

Conflicts:

	indra/llmath/llmatrix4a.h
	indra/newview/lldrawpooltree.cpp
	indra/newview/llpanelprimmediacontrols.cpp
	indra/newview/llviewercamera.cpp
	indra/newview/llviewercamera.h
	indra/newview/llviewerdisplay.cpp
	indra/newview/llviewerobject.cpp
	indra/newview/llvotree.cpp
	indra/newview/llvotree.h
	indra/newview/pipeline.cpp