diff --git a/indra/newview/app_settings/settings_alchemy.xml b/indra/newview/app_settings/settings_alchemy.xml
index dd1da4dd3ef68371568156b9fc67ec1d08c40344..e721e954246f860bdf18322a8829d16143e655e8 100644
--- a/indra/newview/app_settings/settings_alchemy.xml
+++ b/indra/newview/app_settings/settings_alchemy.xml
@@ -1006,6 +1006,17 @@
       <key>Value</key>
       <integer>1</integer>
     </map>
+    <key>SnapshotDetection</key>
+    <map>
+      <key>Comment</key>
+      <string>Detect snapshot animation being played</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
     <key>UIImgTransparentUUID</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index b127f3edee6951a829532441b2f03f7c35ce60b1..000748bfa6c56f594e543d11ff4a022bd51aa2cd 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -6153,7 +6153,14 @@ BOOL LLVOAvatar::processSingleAnimationStateChange( const LLUUID& anim_id, BOOL
 		{
 			sitDown(TRUE);
 		}
-
+        else if (anim_id == ANIM_AGENT_SNAPSHOT)
+        {
+            static LLCachedControl<bool> announce_snapshot(gSavedSettings, "SnapshotDetection");
+            if (announce_snapshot)
+            {
+                LLNotificationsUtil::add("SnapshotDetected", LLSD().with("NAME", LLSLURL("agent", mID, "about").getSLURLString()));
+            }
+        }
 
 		if (startMotion(anim_id))
 		{
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index d600f8989bf83ea3b3233e0183649a79799e56a2..02dc891b16fd7885b74e38d7601126beeea9edcf 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -12539,6 +12539,13 @@ Are you sure you wish to continue?
     Shape import failed. Are you sure [FILENAME] is an avatar genepool file?
   </notification>
 
+  <notification
+	icon="notifytip.tga"
+	name="SnapshotDetected"
+	type="notifytip">
+	[NAME] took a snapshot! :O
+  </notification>
+
   <notification
    icon="notifytip.tga"
    name="AlwaysRunEnabled"