diff options
| author | Erik Kundiman <erik@megapahit.org> | 2025-09-09 14:23:24 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2025-09-09 14:23:24 +0800 |
| commit | 693137a6487e6ffda9ff15ade62d0e8bfec1bf49 (patch) | |
| tree | 12c078a35bebfd139d108f5fb7cd6c7fc4455c70 /indra/llinventory/llpermissions.h | |
| parent | b9ab04cd6e253848bad865fc1b5ea993a2a060f3 (diff) | |
| parent | 8a9a3dc9d760db37bb963d3e5bfadafdd94ee08d (diff) | |
Merge branch '2025.06'
Diffstat (limited to 'indra/llinventory/llpermissions.h')
| -rw-r--r-- | indra/llinventory/llpermissions.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/llinventory/llpermissions.h b/indra/llinventory/llpermissions.h index a68abcfa34..82cdc03727 100644 --- a/indra/llinventory/llpermissions.h +++ b/indra/llinventory/llpermissions.h @@ -299,6 +299,8 @@ public: bool importLegacyStream(std::istream& input_stream); bool exportLegacyStream(std::ostream& output_stream) const; + void importLLSD(const LLSD& sd_perm); + bool operator==(const LLPermissions &rhs) const; bool operator!=(const LLPermissions &rhs) const; @@ -435,6 +437,7 @@ protected: // like 'creator_id', 'owner_id', etc, with the value copied from the // permission object. LLSD ll_create_sd_from_permissions(const LLPermissions& perm); +void ll_fill_sd_from_permissions(LLSD& rv, const LLPermissions& perm); LLPermissions ll_permissions_from_sd(const LLSD& sd_perm); #endif |