summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorsimon@lindenlab.com <simon@lindenlab.com>2011-06-16 13:15:30 -0700
committersimon@lindenlab.com <simon@lindenlab.com>2011-06-16 13:15:30 -0700
commit9a02a4a1ea9634e96222cf79599d853dbef33268 (patch)
treeabac88978fade4a8f0998272a1cf5c30e6431769 /indra/newview/app_settings
parentf0694e45c8d140bd93abe097ec8e8cc99630ed39 (diff)
parent50393788693578a2fe3a934faa04b382d75f1657 (diff)
Merge with latest lindenlab/viewer-development
Diffstat (limited to 'indra/newview/app_settings')
-rw-r--r--indra/newview/app_settings/keywords.ini1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/app_settings/keywords.ini b/indra/newview/app_settings/keywords.ini
index 263b73ba23..4e8f90d901 100644
--- a/indra/newview/app_settings/keywords.ini
+++ b/indra/newview/app_settings/keywords.ini
@@ -498,6 +498,7 @@ PARCEL_DETAILS_OWNER Used with llGetParcelDetails to get the parcel owner id.
PARCEL_DETAILS_GROUP Used with llGetParcelDetails to get the parcel group id.
PARCEL_DETAILS_AREA Used with llGetParcelDetails to get the parcel area in square meters.
PARCEL_DETAILS_ID Used with llGetParcelDetails to get the parcel id.
+PARCEL_DETAILS_HIDDEN_AVS Used with llGetParcelDetails to get the hidden avatars setting.
STRING_TRIM_HEAD Used with llStringTrim to trim leading spaces from a string.
STRING_TRIM_TAIL Used with llStringTrim to trim trailing spaces from a string.