diff options
| author | Erik Kundiman <erik@megapahit.org> | 2023-09-15 14:34:15 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2023-09-15 14:34:15 +0800 |
| commit | 238c6512a7a6f8cb8bbea71ef612c91526c15f77 (patch) | |
| tree | d64bdecd5d9a4c85cf23a6ff02c9a4d0e5d29c4e /indra/newview | |
| parent | 1a4bf7a6756f2fcf7ad66cc7d7da53def6b91b99 (diff) | |
| parent | 2e7cf2c1afd9cec1b2e69a5ac7fbbe7ad745c457 (diff) | |
Merge remote-tracking branch 'secondlife/DRTVWR-559' into DRTVWR-559
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llfloaterperms.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llfloaterperms.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llfloaterperms.cpp b/indra/newview/llfloaterperms.cpp index fb55c6c6c4..b53839977e 100644 --- a/indra/newview/llfloaterperms.cpp +++ b/indra/newview/llfloaterperms.cpp @@ -122,7 +122,7 @@ const std::string LLFloaterPermsDefault::sCategoryNames[CAT_LAST] = "Notecards", "Gestures", "Wearables", - "Settings" + "Settings", "Materials" }; 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 }; |