Merge branch 'meshupload' of git://github.com/AlericInglewood/SingularityViewer into meshup

2013-01-13 20:10:25 +01:00
parent 5b0597ea47 f606477ae5
commit 188e42ee4a
75 changed files with 1218 additions and 815 deletions
--- a/indra/newview/llfloatermodelpreview.cpp
+++ b/indra/newview/llfloatermodelpreview.cpp
@@ -341,7 +341,7 @@ BOOL stop_gloderror()

 	if (error != GLOD_NO_ERROR)
 	{
-		llwarns << "GLOD error detected, cannot generate LOD: " << std::hex << error << llendl;
+		llwarns << "GLOD error detected, cannot generate LOD: " << std::hex << error << std::dec << llendl;
 		return TRUE;
 	}