diff options
| author | Richard Linden <none@none> | 2011-10-27 17:24:20 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-10-27 17:24:20 -0700 |
| commit | 9233c4a6b4857800683fe5a20dffc89172b61b43 (patch) | |
| tree | f3094014bedd79bd70ec382087260a4f815644e8 /indra/llui/lluictrlfactory.h | |
| parent | e86adb53f4df0cb0b9d8ea9b6cc805782d9fcf71 (diff) | |
| parent | 6e8ffc247fe52668446b8fa1ed7f1547a755076f (diff) | |
Automated merge with bundle:E:\code\viewer-experience+c:\users\richard\appdata\local\temp\thg.jg4asg\ssh__richard@hg.lindenlab.com_richard_viewer-experience-merge_g9m9fa.hg
Diffstat (limited to 'indra/llui/lluictrlfactory.h')
| -rw-r--r-- | indra/llui/lluictrlfactory.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llui/lluictrlfactory.h b/indra/llui/lluictrlfactory.h index d612ad5005..71c38237c1 100644 --- a/indra/llui/lluictrlfactory.h +++ b/indra/llui/lluictrlfactory.h @@ -125,12 +125,12 @@ private: // base case for recursion, there are NO base classes of LLInitParam::BaseBlock template<int DUMMY> - class ParamDefaults<LLInitParam::BaseBlock, DUMMY> : public LLSingleton<ParamDefaults<LLInitParam::BaseBlock, DUMMY> > + class ParamDefaults<LLInitParam::BaseBlockWithFlags, DUMMY> : public LLSingleton<ParamDefaults<LLInitParam::BaseBlockWithFlags, DUMMY> > { public: - const LLInitParam::BaseBlock& get() { return mBaseBlock; } + const LLInitParam::BaseBlockWithFlags& get() { return mBaseBlock; } private: - LLInitParam::BaseBlock mBaseBlock; + LLInitParam::BaseBlockWithFlags mBaseBlock; }; public: |