diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 96d5ba7bd1..7286afd8ef 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -18309,6 +18309,17 @@ Change of this parameter will affect the layout of buttons in notification toast
       <key>Value</key>
       <integer>1</integer>
     </map>
+    <key>FSCollisionMessagesInChat</key>
+    <map>
+      <key>Comment</key>
+      <string>Shows collision messages in nearby chat.</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
   
 </map>
 </llsd>
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 91faa3b268..b29cf8e44a 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -148,6 +148,8 @@ const static boost::regex NEWLINES("\\n{1}");
 #include "llpanelpeople.h"
 // [/AO]
 #include "tea.h" // <FS:AW opensim currency support>
+#include "chatbar_as_cmdline.h"
+
 #if LL_MSVC
 // disable boost::lexical_cast warning
 #pragma warning (disable:4702)
@@ -7029,6 +7031,38 @@ void process_mean_collision_alert_message(LLMessageSystem *msgsystem, void **use
 
 		type = (EMeanCollisionType)u8type;
 
+		// <FS:Ansariel> Nearby Chat Collision Messages
+		if (gSavedSettings.getBOOL("FSCollisionMessagesInChat"))
+		{
+			std::string action;
+			LLStringUtil::format_map_t args;
+			args["NAME"] = llformat("secondlife:///app/agent/%s/inspect", perp.asString().c_str());
+
+			switch (type)
+			{
+				case MEAN_BUMP:
+					action = LLTrans::getString("Collision_Bump", args);
+					break;
+				case MEAN_LLPUSHOBJECT:
+					action = LLTrans::getString("Collision_PushObject", args);
+					break;
+				case MEAN_SELECTED_OBJECT_COLLIDE:
+					action = LLTrans::getString("Collision_ObjectCollide", args);
+					break;
+				case MEAN_SCRIPTED_OBJECT_COLLIDE:
+					action = LLTrans::getString("Collision_ScriptedObject", args);
+					break;
+				case MEAN_PHYSICAL_OBJECT_COLLIDE:
+					action = LLTrans::getString("Collision_PhysicalObject", args);
+					break;
+				default:
+					action = LLTrans::getString("Collision_UnknownType", args);
+					return;
+			}
+			cmdline_printchat(action);
+		}
+		// </FS:Ansariel> Nearby Chat Collision Messages
+
 		BOOL b_found = FALSE;
 
 		for (mean_collision_list_t::iterator iter = gMeanCollisionList.begin();
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/de/panel_preferences_alerts.xml
index 57d8c522b0..ac9514df2a 100644
--- a/indra/newview/skins/default/xui/de/panel_preferences_alerts.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_alerts.xml
@@ -18,6 +18,7 @@
 	</radio_group>
 	<check_box label="Growl-Benachrichtigungen aktivieren" name="notify_growl_checkbox"/>
 	<check_box label="Growl nutzen auch wenn Firestorm aktiv ist" name="notify_growl_always_checkbox"/>
+	<check_box label="Kollisionsmeldungen im Chat in der Nähe anzeigen" name="FSCollisionMessagesInChat"/>
 	<text name="friends_logon_label">
 		Anzeigen wenn meine Freunden sich an- oder abmelden:
 	</text>
diff --git a/indra/newview/skins/default/xui/de/strings.xml b/indra/newview/skins/default/xui/de/strings.xml
index 48f5477755..d343df5550 100644
--- a/indra/newview/skins/default/xui/de/strings.xml
+++ b/indra/newview/skins/default/xui/de/strings.xml
@@ -5336,6 +5336,26 @@ Setzen Sie den Editorpfad in Anführungszeichen
 		[REGION]
 	</string>
 	
+	<!-- Nearby Chat Collision Messages -->
+	<string name="Collision_Bump">
+		[NAME] hat Sie gestoßen.
+	</string>
+	<string name="Collision_PushObject">
+		[NAME] hat Sie mit einem Skript gestoßen.
+	</string>
+	<string name="Collision_ObjectCollide">
+		[NAME] hat Sie mit einem Objekt getroffen.
+	</string>
+	<string name="Collision_ScriptedObject">
+		[NAME] hat Sie mit einem Skript-Objekt getroffen.
+	</string>
+	<string name="Collision_PhysicalObject">
+		[NAME] hat Sie mit einem physischen Objekt getroffen.
+	</string>
+	<string name="Collision_UnknownType">
+		[NAME] hat eine Kollision unbekannten Typs verursacht.
+	</string>
+
 	<string name="TeleportMaturityExceeded">
 		Der Einwohner kann dieser Region nicht betreten.
 	</string>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml
index f1a9872603..8e359a3c29 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml
@@ -140,6 +140,15 @@
       control_name="FSGrowlWhenActive"
       name="notify_growl_always_checkbox"
       label="Enable Growl even if Firestorm is active"/>
+    <check_box
+     control_name="FSCollisionMessagesInChat"
+     height="16"
+     label="Show collision notifications in nearby chat"
+     layout="topleft"
+     left="10"
+     top_pad="2"
+     name="FSCollisionMessagesInChat"
+     width="180" />
 
 	 <text
      type="string"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index f8c103aeed..94ccc09f9b 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -4110,6 +4110,14 @@ Try enclosing path to the editor with double quotes.
   <string name="NetMapDoubleClickTeleportToolTipMsg">[REGION](Double-click to teleport, shift-drag to pan)</string>
   <string name="NetMapDoubleClickNoActionToolTipMsg">[REGION]</string>
 
+  <!-- Nearby Chat Collision Messages -->
+  <string name="Collision_Bump">[NAME] bumped you.</string>
+  <string name="Collision_PushObject">[NAME] pushed you with a script.</string>
+  <string name="Collision_ObjectCollide">[NAME] hit you with an object.</string>
+  <string name="Collision_ScriptedObject">[NAME] hit you with a scripted object.</string>
+  <string name="Collision_PhysicalObject">[NAME] hit you with a physical object.</string>
+  <string name="Collision_UnknownType">[NAME] caused a collision of unknown type.</string>
+
   <string name="TeleportMaturityExceeded">The Resident cannot visit this region.</string>
 
   <!-- Spell check settings floater -->