summaryrefslogtreecommitdiff
path: root/indra/llinventory
diff options
context:
space:
mode:
authorRider Linden <rider@lindenlab.com>2018-09-07 16:09:32 -0700
committerRider Linden <rider@lindenlab.com>2018-09-07 16:09:32 -0700
commit114e358aae80e9e3ca70de093d51e4700c46df37 (patch)
treec96972974d4f37ba87de5dca99399e596ca41f46 /indra/llinventory
parente539236a75a163b1c6748617bd1e4d2b84aaa3d6 (diff)
Work to make edit floaters respect no mod and no trans. Importing no-trans frame will cause day cycle to become no trans.
Diffstat (limited to 'indra/llinventory')
-rw-r--r--indra/llinventory/llsettingsbase.cpp1
-rw-r--r--indra/llinventory/llsettingsbase.h1
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;