From c3804fd041bc606cb20af615f6f030365202bedc Mon Sep 17 00:00:00 2001 From: Serpentu Date: Fri, 24 May 2013 11:47:06 -0400 Subject: MATBUG-8: fix local texture support for normal and specular maps --- indra/newview/llvovolume.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra/newview/llvovolume.h') diff --git a/indra/newview/llvovolume.h b/indra/newview/llvovolume.h index 52539ab8d5..c53464ef19 100755 --- a/indra/newview/llvovolume.h +++ b/indra/newview/llvovolume.h @@ -31,6 +31,7 @@ #include "llviewertexture.h" #include "llviewermedia.h" #include "llframetimer.h" +#include "lllocalbitmaps.h" #include "m3math.h" // LLMatrix3 #include "m4math.h" // LLMatrix4 #include @@ -346,6 +347,7 @@ public: private: friend class LLDrawable; friend class LLFace; + friend class LLLocalBitmap; // necessary for accessing mFaceMappingChanged. BOOL mFaceMappingChanged; LLFrameTimer mTextureUpdateTimer; -- cgit v1.2.3 From ad89d26dc676dc090e58a3457d62bccbd7dc7e21 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Fri, 24 May 2013 12:55:52 -0400 Subject: norspec-107: remove the need for a friend declaration in local textures --- indra/newview/llvovolume.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llvovolume.h') diff --git a/indra/newview/llvovolume.h b/indra/newview/llvovolume.h index c53464ef19..4d1dded60a 100755 --- a/indra/newview/llvovolume.h +++ b/indra/newview/llvovolume.h @@ -159,6 +159,7 @@ public: const LLMatrix4& getWorldMatrix(LLXformMatrix* xform) const; void markForUpdate(BOOL priority) { LLViewerObject::markForUpdate(priority); mVolumeChanged = TRUE; } + void faceMappingChanged() { mFaceMappingChanged=TRUE; }; /*virtual*/ void onShift(const LLVector4a &shift_vector); // Called when the drawable shifts @@ -347,7 +348,6 @@ public: private: friend class LLDrawable; friend class LLFace; - friend class LLLocalBitmap; // necessary for accessing mFaceMappingChanged. BOOL mFaceMappingChanged; LLFrameTimer mTextureUpdateTimer; -- cgit v1.2.3