diff options
| author | Jacek Antonelli | 2008-08-15 23:45:24 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2008-08-15 23:45:24 -0500 |
| commit | 0a78fa3920b32a51f01ebe7cfa30be45134f398f (patch) | |
| tree | 7d0ebbf55bcb0a77c3957dd64315574281cc2f54 /linden/indra/llinventory/llinventory.h | |
| parent | Second Life viewer sources 1.18.6.2-RC (diff) | |
| download | meta-impy-0a78fa3920b32a51f01ebe7cfa30be45134f398f.zip meta-impy-0a78fa3920b32a51f01ebe7cfa30be45134f398f.tar.gz meta-impy-0a78fa3920b32a51f01ebe7cfa30be45134f398f.tar.bz2 meta-impy-0a78fa3920b32a51f01ebe7cfa30be45134f398f.tar.xz | |
Second Life viewer sources 1.18.6.4-RC
Diffstat (limited to 'linden/indra/llinventory/llinventory.h')
| -rw-r--r-- | linden/indra/llinventory/llinventory.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/linden/indra/llinventory/llinventory.h b/linden/indra/llinventory/llinventory.h index 065c82d..50d3259 100644 --- a/linden/indra/llinventory/llinventory.h +++ b/linden/indra/llinventory/llinventory.h | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | * | 4 | * |
| 5 | * $LicenseInfo:firstyear=2001&license=viewergpl$ | 5 | * $LicenseInfo:firstyear=2001&license=viewergpl$ |
| 6 | * | 6 | * |
| 7 | * Copyright (c) 2001-2007, Linden Research, Inc. | 7 | * Copyright (c) 2001-2008, Linden Research, Inc. |
| 8 | * | 8 | * |
| 9 | * Second Life Viewer Source Code | 9 | * Second Life Viewer Source Code |
| 10 | * The source code in this file ("Source Code") is provided by Linden Lab | 10 | * The source code in this file ("Source Code") is provided by Linden Lab |
| @@ -150,6 +150,9 @@ public: | |||
| 150 | // track attachment points. | 150 | // track attachment points. |
| 151 | II_FLAGS_OBJECT_SLAM_PERM = 0x100, | 151 | II_FLAGS_OBJECT_SLAM_PERM = 0x100, |
| 152 | 152 | ||
| 153 | // flag to indicate that the object sale information has been changed. | ||
| 154 | II_FLAGS_OBJECT_SLAM_SALE = 0x1000, | ||
| 155 | |||
| 153 | // These flags specify which permissions masks to overwrite | 156 | // These flags specify which permissions masks to overwrite |
| 154 | // upon rez. Normally, if no permissions slam (above) or | 157 | // upon rez. Normally, if no permissions slam (above) or |
| 155 | // overwrite flags are set, the asset's permissions are | 158 | // overwrite flags are set, the asset's permissions are |