summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/pl/floater_perms_default.xml
diff options
context:
space:
mode:
authorBrad Linden <brad@lindenlab.com>2024-10-31 11:42:18 -0700
committerBrad Linden <brad@lindenlab.com>2024-10-31 11:42:18 -0700
commit5fbbfb64020cf172a127841fd931024e7bdf0da1 (patch)
tree1dae52ef6f55508cbff90d7d2e8f297a4cc8c9e1 /indra/newview/skins/default/xui/pl/floater_perms_default.xml
parent34e909b6bfbd99d3df481a2f6e566a0b58a15905 (diff)
parent8dfc1d0447bae8afd1567abf85ecbec9b43790a0 (diff)
Merge remote-tracking branch 'origin/release/2024.09-ExtraFPS' into develop
# Conflicts: # indra/newview/featuretable_linux.txt
Diffstat (limited to 'indra/newview/skins/default/xui/pl/floater_perms_default.xml')
0 files changed, 0 insertions, 0 deletions