From 5160aab492981eae5565c414dbe87070ea04f42d Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Tue, 24 Mar 2015 11:54:30 -0700 Subject: Fix viewer-release merge snaffu. Note that mInitialBakesLoaded (new in viewer-release) is not used and generates a compile error when using the new build tools --- indra/newview/llvoavatarself.h | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/llvoavatarself.h') diff --git a/indra/newview/llvoavatarself.h b/indra/newview/llvoavatarself.h index dc5e64d547..0ff96e0837 100755 --- a/indra/newview/llvoavatarself.h +++ b/indra/newview/llvoavatarself.h @@ -109,6 +109,7 @@ private: private: LLUUID mInitialBakeIDs[6]; + //bool mInitialBakesLoaded; /******************************************************************************** -- cgit v1.2.3