merge changes for 3.6.12-release

3 files changed, 10 insertions, 10 deletions

diff --git a/indra/newview/skins/default/textures/toolbar_icons/highlighting.png b/indra/newview/skins/default/textures/toolbar_icons/highlighting.png
index c227f07513..093bace257 100644
--- a/indra/newview/skins/default/textures/toolbar_icons/highlighting.png
+++ b/indra/newview/skins/default/textures/toolbar_icons/highlighting.png
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 95a7839337..e5e2bd4c11 100755
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -1314,10 +1314,10 @@
         <menu_item_call
            label="Quickstart"
            name="Quickstart">
-        <menu_item_call.on_click
+            <menu_item_call.on_click
             function="Advanced.ShowURL"
             parameter="http://community.secondlife.com/t5/English-Knowledge-Base/Second-Life-Quickstart/ta-p/1087919"/>
-        </menu_item_call>              
+        </menu_item_call>
 <!--        <menu_item_call
          label="Tutorial"
          name="Tutorial">
@@ -1326,13 +1326,13 @@
              parameter="hud" />
         </menu_item_call>-->
 		<menu_item_separator/>
-      <menu_item_call
-           label="Knowledge Base"
-           name="Knowledge Base">
-        <menu_item_call.on_click
-            function="Advanced.ShowURL"
+        <menu_item_call
+             label="Knowledge Base"
+             name="Knowledge Base">
+             <menu_item_call.on_click
+                 function="Advanced.ShowURL"
             parameter="http://community.secondlife.com/t5/English-Knowledge-Base/Second-Life-User-s-Guide/ta-p/1244857"/>
-      </menu_item_call>
+        </menu_item_call>
         <menu_item_call
              label="Wiki"
              name="Wiki">
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index bd08c8604f..a93601f5fd 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -3493,7 +3493,7 @@ Version [VERSION] [[INFO_URL] Information about this update]
  icon="alertmodal.tga"
  name="DownloadBackgroundDialog"
  type="alertmodal">
-    We have downloaded an update to your [APP_NAME] installation.
+We have downloaded an update to your [APP_NAME] installation.
     Version [VERSION] [[INFO_URL] Information about this update]
     <tag>confirm</tag>
     <usetemplate
@@ -6344,7 +6344,7 @@ You can only claim public land in the Region you&apos;re in.
   </notification>
 
   <notification
-   icon="notify.tga"
+	icon="notify.tga"
    name="RegionAboutToShutdown"
    persist="false"
    type="notify">