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/panel_instant_message.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/panel_instant_message.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/it/panel_instant_message.xml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/it/panel_instant_message.xml b/indra/newview/skins/default/xui/it/panel_instant_message.xml new file mode 100644 index 0000000000..788595838f --- /dev/null +++ b/indra/newview/skins/default/xui/it/panel_instant_message.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" ?> +<panel name="im_panel" label="im_panel"> + <panel name="im_header" label="im_header"> + <text name="time_box" value="23:30:00"/> + </panel> +</panel> |