summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/floater_region_info.xml
diff options
context:
space:
mode:
authorAndrey Kleshchev <andreykproductengine@lindenlab.com>2024-06-10 17:06:06 +0300
committerAndrey Kleshchev <andreykproductengine@lindenlab.com>2024-06-10 19:25:02 +0300
commit0dcc912cecdfb365c1f4246545ece40ccb7bc18e (patch)
treeccf664c765d1adbbf4985069321df65c85ca36e2 /indra/newview/skins/default/xui/en/floater_region_info.xml
parentbd8438f7083643ae5812b14e35e69e69ef1616c6 (diff)
parentd317454c82e016a02c8a708a0118f3ff29aa8e82 (diff)
Merge main into inventory_favorites
# Conflicts: # indra/llui/llfolderviewmodel.h # indra/newview/llpanelwearing.cpp # indra/newview/llwearableitemslist.cpp
Diffstat (limited to 'indra/newview/skins/default/xui/en/floater_region_info.xml')
-rw-r--r--indra/newview/skins/default/xui/en/floater_region_info.xml10
1 files changed, 6 insertions, 4 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_region_info.xml b/indra/newview/skins/default/xui/en/floater_region_info.xml
index a7bbfc9842..2d45d08857 100644
--- a/indra/newview/skins/default/xui/en/floater_region_info.xml
+++ b/indra/newview/skins/default/xui/en/floater_region_info.xml
@@ -7,14 +7,16 @@
name="regioninfo"
save_rect="true"
title="REGION/ESTATE"
- width="530">
+ width="637">
<tab_container
bottom="555"
follows="left|right|top|bottom"
layout="topleft"
- left="1"
+ left="0"
name="region_panels"
- right="-1"
- tab_position="top"
+ tab_padding_right="3"
+ tab_position="left"
+ halign="left"
+ tab_width="110"
top="20"/>
</floater>