diff options
| author | Oz Linden <oz@lindenlab.com> | 2015-10-12 15:24:56 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2015-10-12 15:24:56 -0400 |
| commit | d17614ca6121dde0ec917664796f263045ad5b6c (patch) | |
| tree | 79535b8ab5cfb38302aaa46dc0531ea5a67da9aa /indra/newview/llvovolume.h | |
| parent | 22e3e8461cf5a36754369c2648b1b4cd252a4d5c (diff) | |
| parent | 4312629e7c5749b86add9d42e6e550602f34dbf5 (diff) | |
merge changes for 3.8.5-release
Diffstat (limited to 'indra/newview/llvovolume.h')
| -rwxr-xr-x | indra/newview/llvovolume.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llvovolume.h b/indra/newview/llvovolume.h index bbaca316b0..ff7438ac09 100755 --- a/indra/newview/llvovolume.h +++ b/indra/newview/llvovolume.h @@ -192,7 +192,7 @@ public: static void setTEMaterialParamsCallbackTE(const LLUUID& objectID, const LLMaterialID& pMaterialID, const LLMaterialPtr pMaterialParams, U32 te); - /*virtual*/ S32 setTEMaterialParams(const U8 te, const LLMaterialPtr pMaterialParams); + /*virtual*/ S32 setTEMaterialParams(const U8 te, const LLMaterialPtr pMaterialParams, bool isInitFromServer); /*virtual*/ S32 setTEScale(const U8 te, const F32 s, const F32 t); /*virtual*/ S32 setTEScaleS(const U8 te, const F32 s); /*virtual*/ S32 setTEScaleT(const U8 te, const F32 t); @@ -339,6 +339,10 @@ protected: void cleanUpMediaImpls(); void addMediaImpl(LLViewerMediaImpl* media_impl, S32 texture_index) ; void removeMediaImpl(S32 texture_index) ; + +private: + bool lodOrSculptChanged(LLDrawable *drawable, BOOL &compiled); + public: static S32 getRenderComplexityMax() {return mRenderComplexity_last;} |