Second Life viewer sources 1.18.1.2

1 files changed, 3 insertions, 5 deletions

diff --git a/linden/indra/newview/llvograss.cpp b/linden/indra/newview/llvograss.cpp
index 5d9c581..4725b33 100644
--- a/linden/indra/newview/llvograss.cpp
+++ b/linden/indra/newview/llvograss.cpp
@@ -336,16 +336,13 @@ void LLVOGrass::setPixelAreaAndAngle(LLAgent &agent)
 // BUG could speed this up by caching the relative_position and range calculations
 void LLVOGrass::updateTextures(LLAgent &agent)
 {
-        F32 texel_area_ratio = 1.f;
-        F32 cos_angle = 1.f;
-
         if (getTEImage(0))
         {
                 if (gPipeline.hasRenderDebugMask(LLPipeline::RENDER_DEBUG_TEXTURE_AREA))
                 {
                         setDebugText(llformat("%4.0f", fsqrtf(mPixelArea)));
                 }
-                getTEImage(0)->addTextureStats(mPixelArea, texel_area_ratio, cos_angle);
+                getTEImage(0)->addTextureStats(mPixelArea);
         }
 }
 
@@ -442,7 +439,8 @@ void LLVOGrass::getGeometry(S32 idx,
                                                                 LLStrider<U32>& indicesp)
 {
         mPatch = mRegionp->getLand().resolvePatchRegion(getPositionRegion());
-        mLastPatchUpdateTime = mPatch->getLastUpdateTime();
+        if (mPatch)
+                mLastPatchUpdateTime = mPatch->getLastUpdateTime();
         
         LLVector3 position;
         // Create random blades of grass with gaussian distribution