diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-05-17 18:05:05 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-05-17 18:05:05 +0300 |
| commit | 033b04f3883a0cc9024f45b5e9a0d792cf6dbb77 (patch) | |
| tree | ac49627e31aabda8aaa4b21c74c5aee2b2ea46e8 /indra/newview/skins/default/xui/it/floater_people.xml | |
| parent | 07dc391ab76a8860d04bfb001cdc686cd576663d (diff) | |
| parent | 5a70639b7992842a9f74ec81b11bac56608b8f2e (diff) | |
Merge branch 'main' into DRTVWR-582-maint-U
# Conflicts:
# indra/newview/llagentlistener.cpp
# indra/newview/llcommanddispatcherlistener.cpp
# indra/newview/llfilepicker_mac.mm
# indra/newview/llworldmapview.cpp
Diffstat (limited to 'indra/newview/skins/default/xui/it/floater_people.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/it/floater_people.xml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/it/floater_people.xml b/indra/newview/skins/default/xui/it/floater_people.xml index 1acc3cbf19..e384191084 100644 --- a/indra/newview/skins/default/xui/it/floater_people.xml +++ b/indra/newview/skins/default/xui/it/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="PERSONE"> <panel_container name="main_panel"> <panel label="Profilo del gruppo" name="panel_group_info_sidetray"/> <panel label="Residenti e oggetti bloccati" name="panel_block_list_sidetray"/> + <panel name="panel_group_creation_sidetray" label="Crea un gruppo"/> </panel_container> </floater> |