diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2022-08-31 00:30:07 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2022-08-31 00:30:49 +0300 |
| commit | d19d82712125b8a70056f2fa288cdd25205770a8 (patch) | |
| tree | ece789aa802dac877fc8fe8cb035894e3a4427a6 /indra/newview/skins/default/xui/en/floater_classified.xml | |
| parent | fbccc0986d6487c4490edee6e5793fcaeaf3415b (diff) | |
| parent | d31a83fb946c49a38376ea3b312b5380d0c8c065 (diff) | |
Merge branch master (DRTVWR-483) into DRTVWR-559
# Conflicts:
# indra/newview/lllocalbitmaps.cpp
# indra/newview/lllocalbitmaps.h
# indra/newview/llviewerregion.cpp
# lllocalgltfmaterials.* were modified to match lllocalbitmaps*
Diffstat (limited to 'indra/newview/skins/default/xui/en/floater_classified.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_classified.xml | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_classified.xml b/indra/newview/skins/default/xui/en/floater_classified.xml new file mode 100644 index 0000000000..5b14c827d0 --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_classified.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<floater + positioning="cascading" + can_close="true" + can_resize="false" + height="572" + help_topic="sidebar_me" + min_width="333" + min_height="440" + name="floater_classified" + save_rect="true" + save_visibility="false" + title="Classified" + width="333" > + <panel + class="panel_classified_info" + name="main_panel" + filename="panel_classified_info.xml" + follows="all"/> +</floater> |