summaryrefslogtreecommitdiff
path: root/indra/newview/llsettingspicker.cpp
diff options
context:
space:
mode:
authorAnsariel <ansariel.hiller@phoenixviewer.com>2024-06-10 20:20:03 +0200
committerAndrey Lihatskiy <alihatskiy@productengine.com>2024-06-10 21:28:24 +0300
commit901c3cbe09dae85ccc0c1ce0661a7b878293b608 (patch)
tree8f2b0d0f83a2270000dfc08f9e4fadc14bc291df /indra/newview/llsettingspicker.cpp
parentc95b4bf3ea2b681d6d05468b07e60fedb71fa2cf (diff)
Fix merge error introduced in eb526fec0aadcaf30363fdfb1e253a609bf83acc
Diffstat (limited to 'indra/newview/llsettingspicker.cpp')
0 files changed, 0 insertions, 0 deletions