diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2023-06-28 11:02:11 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2023-06-28 11:02:11 -0400 |
| commit | 726851b039b0b0e7d623970f32b6b28616a07dc8 (patch) | |
| tree | 01dd9d23638486031dcc49d201c35d8338091794 /indra/newview/skins/default/xui/fr/floater_people.xml | |
| parent | e9d2f57866e7e4dcb46b21bef525eb9955691578 (diff) | |
| parent | 6f8b812ecd73bf25d44445e1b791f9e1b01f429f (diff) | |
DRTVWR-582: Merge branch DRTVWR-582-maint-U into contribute-frozen
to resolve conflicts in installer_template.nsi
Diffstat (limited to 'indra/newview/skins/default/xui/fr/floater_people.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/fr/floater_people.xml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/fr/floater_people.xml b/indra/newview/skins/default/xui/fr/floater_people.xml index 58701c06b2..cb23476a45 100644 --- a/indra/newview/skins/default/xui/fr/floater_people.xml +++ b/indra/newview/skins/default/xui/fr/floater_people.xml @@ -1,7 +1,8 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<?xml version="1.0" ?> <floater name="floater_people" title="PERSONNES"> <panel_container name="main_panel"> <panel label="Profil du groupe" name="panel_group_info_sidetray"/> <panel label="Résidents et objets ignorés" name="panel_block_list_sidetray"/> + <panel name="panel_group_creation_sidetray" label="Créer un groupe"/> </panel_container> </floater> |