diff options
| author | Brad Linden <brad@lindenlab.com> | 2024-06-18 17:35:32 -0700 |
|---|---|---|
| committer | Brad Linden <brad@lindenlab.com> | 2024-06-18 17:35:32 -0700 |
| commit | 5b13c53e3165fea359d0f1af9c2d10c931f893d5 (patch) | |
| tree | 4be9d049bbe46b40cb3cebbe17eeac7750acf455 /indra/newview/skins/default/xui/es/panel_preferences_chat.xml | |
| parent | 4e593dcded0ab1cc033a9be4d0489d12a8305a7e (diff) | |
| parent | c910fdda2bcd45a649592bb41cae7fbe8348fb38 (diff) | |
Merge remote-tracking branch 'origin/1771-mesh-objects-do-not-display-until-you-walk-directly-over-them' into develop
resolve known conflicts early.
# Conflicts:
# indra/newview/llvocache.cpp
Diffstat (limited to 'indra/newview/skins/default/xui/es/panel_preferences_chat.xml')
0 files changed, 0 insertions, 0 deletions