summaryrefslogtreecommitdiff
path: root/indra/llinventory
diff options
context:
space:
mode:
authorJames Cook <james@lindenlab.com>2010-05-13 15:47:32 -0700
committerJames Cook <james@lindenlab.com>2010-05-13 15:47:32 -0700
commit8b524549902b780c2833691368bc35bdb1837cd9 (patch)
treeb742a7f5463fb42663fa51e1029c80671ceb881b /indra/llinventory
parent14f423a23c38bf554e9633752074fbcabd92599c (diff)
parentaebb49520b1919e0ac2bcc7373fc2db031e3b7f0 (diff)
merge pull from dessie/viewer-public, picking up SLE code
Diffstat (limited to 'indra/llinventory')
-rw-r--r--indra/llinventory/llinventorydefines.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llinventory/llinventorydefines.h b/indra/llinventory/llinventorydefines.h
index ccf1a356de..67e629c546 100644
--- a/indra/llinventory/llinventorydefines.h
+++ b/indra/llinventory/llinventorydefines.h
@@ -89,7 +89,7 @@ public:
II_FLAGS_WEARABLES_MASK = 0xff,
// Wearables use the low order byte of flags to store the
- // EWearableType enumeration found in newview/llwearable.h
+ // LLWearableType::EType enumeration found in newview/llwearable.h
II_FLAGS_PERM_OVERWRITE_MASK = (II_FLAGS_OBJECT_SLAM_PERM |
II_FLAGS_OBJECT_SLAM_SALE |