diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2009-07-22 17:30:16 +0000 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2009-07-22 17:30:16 +0000 |
| commit | 858f7846715f5182ed9b5e8da7f98ae972297b10 (patch) | |
| tree | bddcd7adb3fea335dac221a8b756c3dd6b2157a0 /indra/llcommon | |
| parent | c15b6d7d40ac03957b417cbe0e67d9c1bfa7703f (diff) | |
Merge of Parcel API V1 to trunk for 1.30 release. Hallelujah!
QAR-1687 Merge request for Parcel API project for 1.30 release
svn merge -r127262:127300 svn+ssh://svn/svn/linden/branches/parcel-api/merge-qar-1687-parcel-api-2 trunk
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/metapropertyt.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/indra/llcommon/metapropertyt.h b/indra/llcommon/metapropertyt.h index 79a536a224..5ad230d1d5 100644 --- a/indra/llcommon/metapropertyt.h +++ b/indra/llcommon/metapropertyt.h @@ -94,6 +94,13 @@ inline const LLReflective* LLMetaPropertyT<LLUUID>::get(const LLReflective* obje } template <> +inline const LLReflective* LLMetaPropertyT<bool>::get(const LLReflective* object) const +{ + checkObjectClass(object); + return NULL; +} + +template <> inline LLSD LLMetaPropertyT<S32>::getLLSD(const LLReflective* object) const { return *(getProperty(object)); @@ -111,6 +118,12 @@ inline LLSD LLMetaPropertyT<LLUUID>::getLLSD(const LLReflective* object) const return *(getProperty(object)); } +template <> +inline LLSD LLMetaPropertyT<bool>::getLLSD(const LLReflective* object) const +{ + return *(getProperty(object)); +} + template<class TObject, class TProperty> class LLMetaPropertyTT : public LLMetaPropertyT<TProperty> { |