diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-11-29 10:45:43 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-11-29 10:45:43 +0200 |
| commit | d1c0a5b840e9ec2d3a468216339ae5367aed4bf5 (patch) | |
| tree | 30a47a8bf5ba4561c0f6d3839afd1a9f35dac873 /indra/newview/llfloaterperms.h | |
| parent | 6f99a844efe4e7809ed0a995b0118851e6f0d8d5 (diff) | |
| parent | 53e958a2638705572ed7dbf61369d92b332c4b60 (diff) | |
Merge branch 'DRTVWR-559' into marchcat/587-v-pbr-merge
# Conflicts:
# indra/llcommon/CMakeLists.txt
# indra/newview/llspatialpartition.cpp
# indra/newview/llviewergenericmessage.cpp
# indra/newview/llvoavatar.cpp
Diffstat (limited to 'indra/newview/llfloaterperms.h')
| -rw-r--r-- | indra/newview/llfloaterperms.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llfloaterperms.h b/indra/newview/llfloaterperms.h index 02359a256e..97ddec7cba 100644 --- a/indra/newview/llfloaterperms.h +++ b/indra/newview/llfloaterperms.h @@ -75,6 +75,7 @@ enum Categories CAT_GESTURES, CAT_WEARABLES, CAT_SETTINGS, + CAT_MATERIALS, CAT_LAST }; |