norspec-107: remove the need for a friend declaration in local textures

2 files changed, 3 insertions, 5 deletions

diff --git a/indra/newview/lllocalbitmaps.cpp b/indra/newview/lllocalbitmaps.cpp
index 724c7cca0f..2d9385390b 100755
--- a/indra/newview/lllocalbitmaps.cpp
+++ b/indra/newview/lllocalbitmaps.cpp
@@ -485,10 +485,8 @@ void LLLocalBitmap::updateUserPrims(LLUUID old_id, LLUUID new_id, U32 channel)
 			}
 
 			if (update_mat)
-			{   // i had to make LLLocalBitmap friend of LLVOVolume for this,
-                // i realize it might seem somewhat hacky, but it's also simple.
-                // will gladly accept a better solution though.
-                object->mDrawable->getVOVolume()->mFaceMappingChanged = TRUE;
+			{
+                object->mDrawable->getVOVolume()->faceMappingChanged();
 			}
 		}
 	}
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;