diff options
| author | Richard Nelson <richard@lindenlab.com> | 2011-09-16 11:57:57 -0700 |
|---|---|---|
| committer | Richard Nelson <richard@lindenlab.com> | 2011-09-16 11:57:57 -0700 |
| commit | c10832bb9ade5efa2a501cb3b39f769aa3024363 (patch) | |
| tree | 7ea88940c5e92e500f88ccf4ec0359952f59ed5e /indra/llui | |
| parent | 2809778bf1a487e2a2786301d7fd651c82290432 (diff) | |
added Flag as new param type...
usage: <foo><bar/></foo> will set the bar flag on foo
LLSD foo; foo["bar"]; will set the bar flag on foo
converted notifications unique to use flag
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/llnotificationtemplate.h | 4 | ||||
| -rw-r--r-- | indra/llui/lluictrlfactory.h | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/indra/llui/llnotificationtemplate.h b/indra/llui/llnotificationtemplate.h index eff572b553..ab777d37a5 100644 --- a/indra/llui/llnotificationtemplate.h +++ b/indra/llui/llnotificationtemplate.h @@ -88,10 +88,10 @@ struct LLNotificationTemplate { private: // this idiom allows - // <notification unique="true"> + // <notification> <unique/> </notification> // as well as // <notification> <unique> <context></context> </unique>... - Optional<bool> dummy_val; + Flag dummy_val; public: Multiple<UniquenessContext> contexts; 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: |