Trival V3 llmath merge.

indra/newview/llagentwearables.cpp

@@ -857,7 +857,10 @@ void LLAgentWearables::popWearable(const LLWearableType::EType type, U32 index)
 	if (wearable)
 	{
 		mWearableDatas[type].erase(mWearableDatas[type].begin() + index);
+		if (isAgentAvatarValid())
+		{
 		gAgentAvatarp->wearableUpdated(wearable->getType(), TRUE);
+		}
 		wearable->setLabelUpdated();
 	}
 }

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

indra/newview/llpanelmediahud.h

@@ -36,7 +36,8 @@
 #include "llpanel.h"
 #include "llviewermedia.h"
 
-class LLCoordWindow;
+#include "llcoord.h"
+
 class LLViewerMediaImpl;
 
 class LLPanelMediaHUD : public LLPanel

indra/newview/llviewercamera.h

@@ -38,8 +38,8 @@
 #include "llstat.h"
 #include "lltimer.h"
 #include "m4math.h"
+#include "llcoord.h"
 
-class LLCoordGL;
 class LLViewerObject;
 
 // This rotation matrix moves the default OpenGL reference frame 

indra/newview/llworldmapview.h

@@ -52,7 +52,6 @@ const S32 DEFAULT_TRACKING_ARROW_SIZE = 16;
 
 class LLColor4;
 class LLColor4U;
-class LLCoordGL;
 class LLViewerTexture;
 class LLTextBox;