diff options
| author | Jonathan "Geenz" Goodman <geenz@lindenlab.com> | 2025-08-29 12:48:44 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-08-29 12:48:44 -0400 |
| commit | 842ac1e1503e41662c924289905b43b336b52a53 (patch) | |
| tree | d8067fc99f6c699e3d15510c8521a32102f5cb30 /indra/llinventory/llpermissions.h | |
| parent | 28678996ceaea019aafaa26911a440769320c498 (diff) | |
| parent | 787b63f4c29f6ef56f355ec80084458a1bbcfb35 (diff) | |
Merge pull request #4379 from secondlife/release/2025.06
Release/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 |