diff options
| author | Graham Linden <graham@lindenlab.com> | 2018-09-10 16:48:26 +0100 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2018-09-10 16:48:26 +0100 |
| commit | e5c0022a7c102e96d3e93d91eda08af81defeef1 (patch) | |
| tree | c6d712cbc1378b441ccee65ec610de06efdcb532 /indra/llinventory | |
| parent | e075c65ee22a54b114808057399b5c7546dfb08a (diff) | |
| parent | 8c9d758e3a5de9e11b2e33753e61a5359dbff8de (diff) | |
Merge
Diffstat (limited to 'indra/llinventory')
| -rw-r--r-- | indra/llinventory/llsettingsbase.cpp | 1 | ||||
| -rw-r--r-- | indra/llinventory/llsettingsbase.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/indra/llinventory/llsettingsbase.cpp b/indra/llinventory/llsettingsbase.cpp index 5283a8dc8a..2adbb213e6 100644 --- a/indra/llinventory/llsettingsbase.cpp +++ b/indra/llinventory/llsettingsbase.cpp @@ -58,6 +58,7 @@ const std::string LLSettingsBase::SETTING_FLAGS("flags"); const U32 LLSettingsBase::FLAG_NOCOPY(0x01 << 0); const U32 LLSettingsBase::FLAG_NOMOD(0x01 << 1); +const U32 LLSettingsBase::FLAG_NOTRANS(0x01 << 2); //========================================================================= LLSettingsBase::LLSettingsBase(): diff --git a/indra/llinventory/llsettingsbase.h b/indra/llinventory/llsettingsbase.h index a90cec6323..aea1bc3fde 100644 --- a/indra/llinventory/llsettingsbase.h +++ b/indra/llinventory/llsettingsbase.h @@ -74,6 +74,7 @@ public: static const U32 FLAG_NOCOPY; static const U32 FLAG_NOMOD; + static const U32 FLAG_NOTRANS; typedef std::map<std::string, S32> parammapping_t; |