diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-09-21 14:25:48 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-09-21 14:25:48 -0700 |
| commit | 5ae6bbc848e0146bb4b5ea5dd4a5d26d2c5702ba (patch) | |
| tree | cfd1c052aef51bfa95298613a95fc78f64c3aefc /indra/llui/lluictrlfactory.h | |
| parent | 7bc6e626f40a910b4a3e5b88161e96b9967bd24d (diff) | |
| parent | 305b65f6f600b81de9a78e1246d2a5353cc3189b (diff) | |
EXP-1207 : merge with viewer-experience-fui
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 f0ba7fc7d7..d345ad4cd0 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: |