Skip to content
Snippets Groups Projects
Commit 858f7846 authored by Monty Brandenberg's avatar Monty Brandenberg
Browse files

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
parent c15b6d7d
No related branches found
No related tags found
No related merge requests found
...@@ -93,6 +93,13 @@ inline const LLReflective* LLMetaPropertyT<LLUUID>::get(const LLReflective* obje ...@@ -93,6 +93,13 @@ inline const LLReflective* LLMetaPropertyT<LLUUID>::get(const LLReflective* obje
return NULL; return NULL;
} }
template <>
inline const LLReflective* LLMetaPropertyT<bool>::get(const LLReflective* object) const
{
checkObjectClass(object);
return NULL;
}
template <> template <>
inline LLSD LLMetaPropertyT<S32>::getLLSD(const LLReflective* object) const inline LLSD LLMetaPropertyT<S32>::getLLSD(const LLReflective* object) const
{ {
...@@ -111,6 +118,12 @@ inline LLSD LLMetaPropertyT<LLUUID>::getLLSD(const LLReflective* object) const ...@@ -111,6 +118,12 @@ inline LLSD LLMetaPropertyT<LLUUID>::getLLSD(const LLReflective* object) const
return *(getProperty(object)); return *(getProperty(object));
} }
template <>
inline LLSD LLMetaPropertyT<bool>::getLLSD(const LLReflective* object) const
{
return *(getProperty(object));
}
template<class TObject, class TProperty> template<class TObject, class TProperty>
class LLMetaPropertyTT : public LLMetaPropertyT<TProperty> class LLMetaPropertyTT : public LLMetaPropertyT<TProperty>
{ {
......
...@@ -135,9 +135,9 @@ class LLSD; ...@@ -135,9 +135,9 @@ class LLSD;
class LLAccessEntry class LLAccessEntry
{ {
public: public:
LLUUID mID; LLUUID mID; // Agent ID
S32 mTime; S32 mTime; // Time (unix seconds) when entry expires
U32 mFlags; U32 mFlags; // Not used - currently should always be zero
}; };
typedef std::map<LLUUID,LLAccessEntry>::iterator access_map_iterator; typedef std::map<LLUUID,LLAccessEntry>::iterator access_map_iterator;
......
...@@ -954,6 +954,8 @@ void LLMetaClassT<LLPermissions>::reflectProperties(LLMetaClass& meta_class) ...@@ -954,6 +954,8 @@ void LLMetaClassT<LLPermissions>::reflectProperties(LLMetaClass& meta_class)
{ {
reflectProperty(meta_class, "mCreator", &LLPermissions::mCreator); reflectProperty(meta_class, "mCreator", &LLPermissions::mCreator);
reflectProperty(meta_class, "mOwner", &LLPermissions::mOwner); reflectProperty(meta_class, "mOwner", &LLPermissions::mOwner);
reflectProperty(meta_class, "mGroup", &LLPermissions::mGroup);
reflectProperty(meta_class, "mIsGroupOwned", &LLPermissions::mIsGroupOwned);
} }
// virtual // virtual
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment