Skip to content
Snippets Groups Projects
Commit e873695e authored by Vadim Savchuk's avatar Vadim Savchuk
Browse files

merge 

--HG--
branch : product-engine
parents 7a491cbd acdc8289
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
indra/newview/skins/default/textures/textures.xml
+ 3
− 0
View file @ e873695e
...@@ -444,6 +444,9 @@ ...@@ -444,6 +444,9 @@
<!--WARNING OLD ART *do not use*--> <!--WARNING OLD ART *do not use*-->
<texture name="Banner_ForSale" file_name="Banner_ForSale.png" preload="false" />
<texture name="Banner_YouAreHere" file_name="Banner_YouAreHere.png" preload="false" />
<texture name="btn_chatbar.tga" scale.left="20" scale.top="24" scale.right="44" scale.bottom="0" /> <texture name="btn_chatbar.tga" scale.left="20" scale.top="24" scale.right="44" scale.bottom="0" />
<texture name="btn_chatbar_selected.tga" scale.left="20" scale.top="24" scale.right="44" scale.bottom="0" /> <texture name="btn_chatbar_selected.tga" scale.left="20" scale.top="24" scale.right="44" scale.bottom="0" />
......
indra/newview/skins/default/xui/en/panel_bottomtray.xml
+ 1
− 1
View file @ e873695e
...@@ -93,7 +93,7 @@ ...@@ -93,7 +93,7 @@
min_width="76" min_width="76"
name="gesture_panel" name="gesture_panel"
user_resize="false"> user_resize="false">
<button <gesture_combo_box
follows="right" follows="right"
height="23" height="23"
label="Gesture" label="Gesture"
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment