Merge remote-tracking branch 'fowlerdm/main'

9 files changed, 10 insertions, 9 deletions

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 75c3e6cacb..a07396b5b1 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -1241,8 +1241,8 @@
       <key>Value</key>
       <array>
         <real>-3.0</real>
-        <real>0.0</real>
-        <real>0.75</real>
+        <real>0.5</real>
+        <real>0.2</real>
       </array>
     </map>
     <key>CameraOffsetScale</key>
@@ -3056,9 +3056,9 @@
       <string>Vector3D</string>
       <key>Value</key>
       <array>
-        <real>1.0</real>
-        <real>0.0</real>
-        <real>1.0</real>
+        <real>0.9</real>
+        <real>0.5</real>
+        <real>0.2</real>
       </array>
     </map>
     <key>AvatarSitRotation</key>
diff --git a/indra/newview/icons/hicolor/128x128/apps/megapahit.png b/indra/newview/icons/hicolor/128x128/apps/megapahit.png
index 48abffffd7..5ed63802d3 100644
--- a/indra/newview/icons/hicolor/128x128/apps/megapahit.png
+++ b/indra/newview/icons/hicolor/128x128/apps/megapahit.png
diff --git a/indra/newview/icons/hicolor/256x256/apps/megapahit.png b/indra/newview/icons/hicolor/256x256/apps/megapahit.png
index d792c460ac..07deb76090 100644
--- a/indra/newview/icons/hicolor/256x256/apps/megapahit.png
+++ b/indra/newview/icons/hicolor/256x256/apps/megapahit.png
diff --git a/indra/newview/icons/hicolor/512x512/apps/megapahit.png b/indra/newview/icons/hicolor/512x512/apps/megapahit.png
index 23d6209f67..fdbec7e739 100644
--- a/indra/newview/icons/hicolor/512x512/apps/megapahit.png
+++ b/indra/newview/icons/hicolor/512x512/apps/megapahit.png
diff --git a/indra/newview/icons/hicolor/96x96/apps/megapahit.png b/indra/newview/icons/hicolor/96x96/apps/megapahit.png
index d35578dcda..ffe9066f4a 100644
--- a/indra/newview/icons/hicolor/96x96/apps/megapahit.png
+++ b/indra/newview/icons/hicolor/96x96/apps/megapahit.png
diff --git a/indra/newview/skins/default/xui/en/panel_edit_shape.xml b/indra/newview/skins/default/xui/en/panel_edit_shape.xml
index c1d743c3da..bd0335df6e 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_shape.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_shape.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
  <panel
-     background_visible="true"
+     background_visible="false"
 	 follows="all"
 	 height="400"
 	 layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/panel_edit_wearable.xml b/indra/newview/skins/default/xui/en/panel_edit_wearable.xml
index 4d2069c9fe..c18bfa3fad 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_wearable.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_wearable.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
- background_visible="true"
+ background_visible="false"
  bevel_style="in"
  follows="all"
  height="570"
diff --git a/indra/newview/skins/default/xui/en/panel_gltf_material.xml b/indra/newview/skins/default/xui/en/panel_gltf_material.xml
index 45df40bc05..2b5e3e9fad 100644
--- a/indra/newview/skins/default/xui/en/panel_gltf_material.xml
+++ b/indra/newview/skins/default/xui/en/panel_gltf_material.xml
@@ -7,7 +7,8 @@
  top="0"
  left="0"
  height="768"
- width="247">
+ width="247"
+ background_visible="false">
   <check_box
     follows="left|top"
     layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/panel_notify_textbox.xml b/indra/newview/skins/default/xui/en/panel_notify_textbox.xml
index 27d0f7d383..544d90a84f 100644
--- a/indra/newview/skins/default/xui/en/panel_notify_textbox.xml
+++ b/indra/newview/skins/default/xui/en/panel_notify_textbox.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
-   background_visible="true"
+   background_visible="false"
    height="215"
    label="instant_message"
    layout="topleft"