diff options
| author | Josh Bell <josh@lindenlab.com> | 2008-02-28 18:15:01 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2008-02-28 18:15:01 +0000 |
| commit | 2fdd7c35f33d1d98091547b8e96ad9ebf99dee47 (patch) | |
| tree | 247ba5247139531ac636bb8b9db7ddf3d5ce6203 /indra/llinventory/llpermissions.h | |
| parent | 42bc4ba02abebced9fc3e7f91317ae293cbd20dd (diff) | |
svn merge -r 80357:80990 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-19-1-Server --> release
Merge patches from 1.19.1 Server branch:
* QAR-293 Fix for hardcoded TTLs in web dataservices
* DEV-10826 fix for busted binary and notation parse if handed an unlimited parse size
* Bounce apache2 processes before starting backbone/dataserver/simulator
* Changing web-ds TTL in a way that any query that has 0 < ttl <=60 will have ttl = 61.
* Partial reversion of multiagent-chat to 1.19.0 to address fast memory leak
* Fixed minor, non user facing bug in multiagentchat
* set-classified-stats: Rewrote to use new MDB2 query reformatting syntax
* Fixed possible bad conversion of vivox data
* DEV-550, caching changes to DirClassifieds Query
* QAR-240 (DEV-8488) Prevent residents from purging stuff that isn't trash on the backend
* More mem leak fixes for multiagent-chat
* QAR-274 Fetch inventory descendents over TCP (via HTTP cap) instead of UDP
* DEV-10151: Sometimes group IMs appear to be person to person IMs
* QAR-321 Changes to crash_reporter
* DEV-11004 Speed up people search query using FORCE INDEX (PRIMARY) on the username table if the first-name query fragment is >= 3 chars
* DEV-11004 Speed up people search query using FORCE INDEX (PRIMARY). Web service version of this, must use two named queries because we need to change the query based on input string length.
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 9370d6480b..36acc438be 100644 --- a/indra/llinventory/llpermissions.h +++ b/indra/llinventory/llpermissions.h @@ -294,6 +294,9 @@ public: // MISC METHODS and OPERATORS // + LLSD packMessage() const; + void unpackMessage(LLSD perms); + // For messaging system support void packMessage(LLMessageSystem* msg) const; void unpackMessage(LLMessageSystem* msg, const char* block, S32 block_num = 0); |