Trival V3 llmath merge.

2012-05-21 20:23:42 -05:00
parent 9eda9ad462
commit ae0804beea
16 changed files with 158 additions and 139 deletions
--- a/indra/newview/llmediactrl.cpp
+++ b/indra/newview/llmediactrl.cpp
@@ -722,7 +722,7 @@ void LLMediaCtrl::draw()
 				// to get render origin for this view (with unit scale)
 				gGL.translatef(floorf(LLFontGL::sCurOrigin.mX * LLUI::sGLScaleFactor.mV[VX]), 
 							floorf(LLFontGL::sCurOrigin.mY * LLUI::sGLScaleFactor.mV[VY]), 
-							LLFontGL::sCurOrigin.mZ);
+							LLFontGL::sCurDepth);
 			}

 			// scale texture to fit the space using texture coords