diff options
author | Loren Shih <seraph@lindenlab.com> | 2009-07-24 00:46:26 +0000 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2009-07-24 00:46:26 +0000 |
commit | 17b9cda4325a035f00e077a6a8e33a8c4f2d5a89 (patch) | |
tree | 61cf3566c5162237104dfeec8c9332aa34883aa3 /indra/llmessage/message_prehash.h | |
parent | 858f7846715f5182ed9b5e8da7f98ae972297b10 (diff) |
For QAR-1710 : Server merge for QAR-1594 QAR-1643 QAR-1644 - "AVP Changes [SIM]"
svn merge -r 128022:128028 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/server__merge__trunk-r127980 to svn+ssh://svn.lindenlab.com/svn/linden/trunk
This is the server-side merge for inventory links, folder links&types, and landmark&callingcard permissions.
Diffstat (limited to 'indra/llmessage/message_prehash.h')
-rw-r--r-- | indra/llmessage/message_prehash.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llmessage/message_prehash.h b/indra/llmessage/message_prehash.h index f8ef610408..e73ec3e5e1 100644 --- a/indra/llmessage/message_prehash.h +++ b/indra/llmessage/message_prehash.h @@ -174,6 +174,7 @@ extern char * _PREHASH_UpdateInventoryItem; extern char * _PREHASH_UpdateCreateInventoryItem; extern char * _PREHASH_MoveInventoryItem; extern char * _PREHASH_CopyInventoryItem; +extern char * _PREHASH_LinkInventoryItem; extern char * _PREHASH_RemoveInventoryItem; extern char * _PREHASH_CreateInventoryItem; extern char * _PREHASH_PathTwistBegin; |