diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-05-17 17:47:45 +0300 |
---|---|---|
committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-05-17 17:47:45 +0300 |
commit | 4dcab10bf8a652c6513bf6c9eec3184f79d4d219 (patch) | |
tree | 3cb870beefc8c0488532e0b424450780357ed7f5 /indra/newview/skins/default/xui/pt/floater_flickr.xml | |
parent | 42f16180a985fc0e4704a4e25489ada9d662631a (diff) | |
parent | 5a70639b7992842a9f74ec81b11bac56608b8f2e (diff) |
Merge branch 'main' into DRTVWR-580-maint-T
# Conflicts:
# doc/contributions.txt
# indra/llcharacter/llkeyframemotion.cpp
# indra/newview/llfilepicker.cpp
Diffstat (limited to 'indra/newview/skins/default/xui/pt/floater_flickr.xml')
-rw-r--r-- | indra/newview/skins/default/xui/pt/floater_flickr.xml | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/indra/newview/skins/default/xui/pt/floater_flickr.xml b/indra/newview/skins/default/xui/pt/floater_flickr.xml deleted file mode 100644 index d048dbb658..0000000000 --- a/indra/newview/skins/default/xui/pt/floater_flickr.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="floater_flickr" title="COMPARTILHAR NO FLICKR"> - <panel name="background"> - <tab_container name="tabs"> - <panel label="FOTO" name="panel_flickr_photo"/> - <panel label="CONTA" name="panel_flickr_account"/> - </tab_container> - <panel name="connection_status_panel"> - <text name="connection_error_text"> - Erro - </text> - <text name="connection_loading_text"> - Carregando... - </text> - </panel> - </panel> -</floater> |