diff --git a/indra/llxuixml/llinitparam.h b/indra/llxuixml/llinitparam.h index fd4482f592c8645e69bc0aef1e53b2a070203151..69dcd474f7dacf371bfd651462b08d90eb613609 100644 --- a/indra/llxuixml/llinitparam.h +++ b/indra/llxuixml/llinitparam.h @@ -302,7 +302,7 @@ namespace LLInitParam } private: - friend BaseBlock; + friend class BaseBlock; U32 mEnclosingBlockOffset:31; U32 mIsProvided:1; @@ -1604,7 +1604,7 @@ namespace LLInitParam }; - class Flag : public FlagBase + class Flag : public BaseBlockWithFlags::FlagBase { public: Flag(const char* name) : FlagBase(name, DERIVED_BLOCK::selfBlockDescriptor().mCurrentBlockPtr)