diff options
| author | simon <none@none> | 2013-03-25 12:19:02 -0700 |
|---|---|---|
| committer | simon <none@none> | 2013-03-25 12:19:02 -0700 |
| commit | a976f5c217ce97c70a7e151b9a490e6a6ebf1396 (patch) | |
| tree | 8d86c9060ac05b34b1a9dfd25f03451e18dcc326 /indra/llcommon/llassettype.h | |
| parent | cc260a635674c56d8fab88a5cd4dd188b4c9ac9c (diff) | |
| parent | 98a82c50d539451e1931826ca75fbc01d611806d (diff) | |
Pull and merge downstream code with CHUI viewer-development by way of viewer-lion
Diffstat (limited to 'indra/llcommon/llassettype.h')
| -rw-r--r-- | indra/llcommon/llassettype.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/llcommon/llassettype.h b/indra/llcommon/llassettype.h index d538accbf7..69b01731e5 100644 --- a/indra/llcommon/llassettype.h +++ b/indra/llcommon/llassettype.h @@ -112,6 +112,9 @@ public: AT_WIDGET = 40, // UI Widget: this is *not* an inventory asset type, only a viewer side asset (e.g. button, other ui items...) + AT_PERSON = 45, + // A user uuid which is not an inventory asset type, used in viewer only for adding a person to a chat via drag and drop. + AT_MESH = 49, // Mesh data in our proprietary SLM format |