summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorJonathan "Geenz" Goodman <geenz@lindenlab.com>2026-05-20 11:35:24 -0400
committerGitHub <noreply@github.com>2026-05-20 11:35:24 -0400
commit491b0b32c74e2186dd34f9be8513bb08d390dfe2 (patch)
treefdd37805842de5ba6f3db69c5699b727388ff50a /indra/newview/app_settings
parentcd2dd394b95361a6a274670c7b7ee8c6f2cf8979 (diff)
parentd53041d9ea1687febf2d9e7c38ac5d4be3c8eae0 (diff)
Merge pull request #5842 from secondlife/release/2026.03
Release/2026.03
Diffstat (limited to 'indra/newview/app_settings')
-rw-r--r--indra/newview/app_settings/settings.xml11
1 files changed, 11 insertions, 0 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index c41a1e5b88..931abeb7ab 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -11129,6 +11129,17 @@
<key>Value</key>
<integer>1</integer>
</map>
+ <key>ShowBlockedConvHistory</key>
+ <map>
+ <key>Comment</key>
+ <string>Specifies whether blocked agents will be shown in Call Log</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>0</integer>
+ </map>
<key>ShowMatureEvents</key>
<map>
<key>Comment</key>