diff options
| author | Graham Madarasz <graham@lindenlab.com> | 2013-04-26 09:02:31 -0700 |
|---|---|---|
| committer | Graham Madarasz <graham@lindenlab.com> | 2013-04-26 09:02:31 -0700 |
| commit | 3834cb6f8ae768a58b3b718eff5ae670a0c299f5 (patch) | |
| tree | 1e683524bea895029e1cf108f6ec12aaf0cb11c4 /indra/newview | |
| parent | b130308d1c021357523f29614f9382e39e991076 (diff) | |
Fix linux breakage from sunshine merge
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/llpanelface.cpp | 1 | ||||
| -rwxr-xr-x | indra/newview/pipeline.cpp | 5 |
2 files changed, 1 insertions, 5 deletions
diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp index a82232101e..d106de3d73 100755 --- a/indra/newview/llpanelface.cpp +++ b/indra/newview/llpanelface.cpp @@ -120,7 +120,6 @@ BOOL LLPanelFace::postBuild() childSetCommitCallback("maskcutoff",&LLPanelFace::onCommitMaterial, this); childSetAction("button align",&LLPanelFace::onClickAutoFix,this); - LLRect rect = this->getRect(); LLTextureCtrl* mTextureCtrl; LLTextureCtrl* mShinyTextureCtrl; LLTextureCtrl* mBumpyTextureCtrl; diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index bc2d28e4b1..b7dd11e78d 100755 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -9316,9 +9316,6 @@ BOOL LLPipeline::getVisiblePointCloud(LLCamera& camera, LLVector3& min, LLVector 3,7 }; - LLVector3 center = (max+min)*0.5f; - LLVector3 size = (max-min)*0.5f; - for (U32 i = 0; i < 12; i++) { for (U32 j = 0; j < 6; ++j) @@ -9560,7 +9557,7 @@ void LLPipeline::generateSunShadow(LLCamera& camera) mSunOrthoClipPlanes = LLVector4(clip, clip.mV[2]*clip.mV[2]/clip.mV[1]); //currently used for amount to extrude frusta corners for constructing shadow frusta - LLVector3 n = RenderShadowNearDist; + //LLVector3 n = RenderShadowNearDist; //F32 nearDist[] = { n.mV[0], n.mV[1], n.mV[2], n.mV[2] }; //put together a universal "near clip" plane for shadow frusta |