diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-08-25 14:48:18 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-08-25 14:48:18 -0500 |
| commit | 2f012dd34f01b359c487c778cbf8842eb419e7c3 (patch) | |
| tree | 2682cf545422d6656a0635bc6a28cba1b797dc66 /indra/newview/llpanelprimmediacontrols.cpp | |
| parent | 6fbc79d5e861085375d776a4da4a5921650b3115 (diff) | |
| parent | 314a89535791e1e5a0c3f4d901c9c1d16fb9b6cc (diff) | |
merge
Diffstat (limited to 'indra/newview/llpanelprimmediacontrols.cpp')
| -rw-r--r-- | indra/newview/llpanelprimmediacontrols.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llpanelprimmediacontrols.cpp b/indra/newview/llpanelprimmediacontrols.cpp index 9cc775d427..c5c9b4f894 100644 --- a/indra/newview/llpanelprimmediacontrols.cpp +++ b/indra/newview/llpanelprimmediacontrols.cpp @@ -65,6 +65,7 @@ #include "llweb.h" #include "llwindow.h" #include "llfloatertools.h" // to enable hide if build tools are up +#include "llvector4a.h" // Functions pulled from pipeline.cpp glh::matrix4f glh_get_current_modelview(); @@ -574,7 +575,9 @@ void LLPanelPrimMediaControls::updateShape() { const LLVolumeFace& vf = volume->getVolumeFace(mTargetObjectFace); - const LLVector3* ext = vf.mExtents; + LLVector3 ext[2]; + ext[0].set(vf.mExtents[0].getF32ptr()); + ext[1].set(vf.mExtents[1].getF32ptr()); LLVector3 center = (ext[0]+ext[1])*0.5f; LLVector3 size = (ext[1]-ext[0])*0.5f; |