7 files changed, 36 insertions, 2 deletions

diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index c950973..072a0f4 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -12320,6 +12320,17 @@
       <key>Value</key>
       <integer>1</integer>
     </map>
+    <key>WarnFirstAO</key>
+    <map>
+      <key>Comment</key>
+      <string>Enables FirstAO warning dialog</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
     <key>WarnFirstAppearance</key>
     <map>
       <key>Comment</key>
diff --git a/linden/indra/newview/floaterao.cpp b/linden/indra/newview/floaterao.cpp
index 5ecd769..b084189 100644
--- a/linden/indra/newview/floaterao.cpp
+++ b/linden/indra/newview/floaterao.cpp
@@ -22,6 +22,7 @@
 // Uncomment and use instead if we ever add the chatbar as a command line - MC
 //#include "chatbar_as_cmdline.h"
 #include "llfloaterchat.h"
+#include "llfirstuse.h"
 
 #include "llinventory.h"
 #include "llinventoryview.h"
@@ -305,6 +306,7 @@ void LLFloaterAO::show(void*)
         {
                 sInstance->close();
         }
+        LLFirstUse::useAO();
 }
 
 bool LLFloaterAO::getInstance()
diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index 63cc952..ae2c294 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -1758,6 +1758,7 @@ bool LLAppViewer::initConfiguration()
         LLFirstUse::addConfigVariable("FirstTeleport");
         LLFirstUse::addConfigVariable("FirstOverrideKeys");
         LLFirstUse::addConfigVariable("FirstAttach");
+        LLFirstUse::addConfigVariable("FirstAO");
         LLFirstUse::addConfigVariable("FirstAppearance");
         LLFirstUse::addConfigVariable("FirstInventory");
         LLFirstUse::addConfigVariable("FirstSandbox");
diff --git a/linden/indra/newview/llfirstuse.cpp b/linden/indra/newview/llfirstuse.cpp
index 877e586..bc982af 100644
--- a/linden/indra/newview/llfirstuse.cpp
+++ b/linden/indra/newview/llfirstuse.cpp
@@ -214,6 +214,17 @@ void LLFirstUse::useAttach()
 }
 
 // static
+void LLFirstUse::useAO()
+{
+        if (gSavedSettings.getWarning("FirstAO"))
+        {
+                gSavedSettings.setWarning("FirstAO", FALSE);
+
+                LLNotifications::instance().add("FirstAO");
+        }
+}
+
+// static
 void LLFirstUse::useAppearance()
 {
         if (gSavedSettings.getWarning("FirstAppearance"))
diff --git a/linden/indra/newview/llfirstuse.h b/linden/indra/newview/llfirstuse.h
index e327984..6467734 100644
--- a/linden/indra/newview/llfirstuse.h
+++ b/linden/indra/newview/llfirstuse.h
@@ -104,6 +104,7 @@ public:
         static void useTeleport();
         static void useOverrideKeys();
         static void useAttach();
+        static void useAO();
         static void useAppearance();
         static void useInventory();
         static void useSandbox();
diff --git a/linden/indra/newview/llprefsadvanced.cpp b/linden/indra/newview/llprefsadvanced.cpp
index 6558d7b..1ecc0ec 100644
--- a/linden/indra/newview/llprefsadvanced.cpp
+++ b/linden/indra/newview/llprefsadvanced.cpp
@@ -49,7 +49,7 @@ BOOL LLPrefsAdvanced::postBuild()
 {
         childSetValue("disable_log_screen_check", gSavedSettings.getBOOL("DisableLoginLogoutScreens"));
         childSetValue("disable_tp_screen_check", gSavedSettings.getBOOL("DisableTeleportScreens"));
-        childSetValue("client_name_tag_check", gSavedSettings.getBOOL("ShowClientNameTag"));
+        childSetValue("client_name_tag_check", gSavedSettings.getBOOL("ClothingLayerProtection"));
 
         return TRUE;
 }
@@ -58,7 +58,7 @@ void LLPrefsAdvanced::apply()
 {
         gSavedSettings.setBOOL("DisableLoginLogoutScreens", childGetValue("disable_log_screen_check"));
         gSavedSettings.setBOOL("DisableTeleportScreens", childGetValue("disable_tp_screen_check"));
-        gSavedSettings.setBOOL("ShowClientNameTag", childGetValue("client_name_tag_check"));
+        gSavedSettings.setBOOL("ClothingLayerProtection", childGetValue("client_name_tag_check"));
 }
 
 void LLPrefsAdvanced::cancel()
diff --git a/linden/indra/newview/skins/default/xui/en-us/notifications.xml b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
index efc45d0..9e97930 100644
--- a/linden/indra/newview/skins/default/xui/en-us/notifications.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
@@ -6670,6 +6670,14 @@ Go to the Official Imprudence Forums to discuss the Imprudence Project.
      yestext="OK"/>
   </notification>
 
+  <notification
+   icon="notify.tga"
+   name="FirstAO"
+   type="notify">
+    Make a new template for AO instructions.
+    Use the toolbar to toggle the AO on/off.
+  </notification>
+
 
   <!--End Imprudence notifications-->