diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 9e10c9c9aa..708aa812fc 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -21663,6 +21663,17 @@ Change of this parameter will affect the layout of buttons in notification toast
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>FSRadarEnhanceByBridge</key>
+    <map>
+      <key>Comment</key>
+      <string>Enhance radar functionality by using client LSL Bridge.</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
     <key>FSSyncronizeTextureMaps</key>
       <map>
       <key>Comment</key>
diff --git a/indra/newview/fsradar.cpp b/indra/newview/fsradar.cpp
index b23bd14730..23bf20cd69 100644
--- a/indra/newview/fsradar.cpp
+++ b/indra/newview/fsradar.cpp
@@ -177,6 +177,7 @@ void FSRadar::updateRadarList()
 	static LLCachedControl<bool> sFSLegacyRadarFriendColoring(gSavedSettings, "FSLegacyRadarFriendColoring");
 	static LLCachedControl<bool> sRadarColorNamesByDistance(gSavedSettings, "FSRadarColorNamesByDistance", false);
 	static LLCachedControl<bool> RadarShowMutedAndDerendered(gSavedSettings, "FSRadarShowMutedAndDerendered");
+	static LLCachedControl<bool> sFSRadarEnhanceByBridge(gSavedSettings, "FSRadarEnhanceByBridge");
 	bool sUseLSLBridge = FSLSLBridge::instance().canUseBridge();
 
 	F32 drawRadius(RenderFarClip);
@@ -329,7 +330,7 @@ void FSRadar::updateRadarList()
 			}
 			
 			//schedule offset requests, if needed
-			if (sUseLSLBridge && (now > (mRadarLastBulkOffsetRequestTime + FSRADAR_COARSE_OFFSET_INTERVAL)) && (now > lastZOffsetTime + FSRADAR_COARSE_OFFSET_INTERVAL))
+			if (sUseLSLBridge && sFSRadarEnhanceByBridge && (now > (mRadarLastBulkOffsetRequestTime + FSRADAR_COARSE_OFFSET_INTERVAL)) && (now > lastZOffsetTime + FSRADAR_COARSE_OFFSET_INTERVAL))
 			{
 				mRadarOffsetRequests.push_back(avId);
 				ent->mLastZOffsetTime = now;
diff --git a/indra/newview/skins/default/xui/en/menu_fs_radar_options.xml b/indra/newview/skins/default/xui/en/menu_fs_radar_options.xml
index ab06c57017..e98e686f4c 100644
--- a/indra/newview/skins/default/xui/en/menu_fs_radar_options.xml
+++ b/indra/newview/skins/default/xui/en/menu_fs_radar_options.xml
@@ -213,7 +213,18 @@
       function="RLV.EnableIfNot"
       parameter="showminimap" />
   </menu_item_check>
-     
+  
+  <menu_item_check
+     label="Enhance radar with LSL-Client Bridge"
+     name="FSRadarEnhanceByBridge"
+     enabled_control="UseLSLBridge">
+	 <menu_item_check.on_check
+     	control="FSRadarEnhanceByBridge" />
+     <menu_item_check.on_click
+        function="ToggleControl"
+        parameter="FSRadarEnhanceByBridge" />
+  </menu_item_check>
+  
   <menu_item_separator layout="topleft" />
   <menu_item_call name="show_blocked_list" label="Open Blocked Residents &amp; Objects">
     <menu_item_call.on_click function="Radar.Option.Action" userdata="panel_block_list_sidetray" />
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
index bdbc0d6e3f..0ebb671e2d 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -1588,6 +1588,17 @@
            height="20"
            width="400" />
 
+          <check_box
+           enabled_control="UseLSLBridge"
+           control_name="FSRadarEnhanceByBridge"
+           name="FSRadarEnhanceByBridge"
+           label="Enhance radar with LSL-Client Bridge"
+           tool_tip="If this is enabled, radar functions responsible for determining avatar locations at high altitudes are assisted by the LSL-Client Bridge, particularly when they're beyond draw distance."
+           layout="topleft"
+           top_pad="0"
+           height="20"
+           width="400" />
+
         </panel>
 
         <!-- Chat: Keyword Alerts -->
diff --git a/indra/newview/skins/default/xui/pl/menu_fs_radar_options.xml b/indra/newview/skins/default/xui/pl/menu_fs_radar_options.xml
index 3d2dd7cd3d..2611678481 100644
--- a/indra/newview/skins/default/xui/pl/menu_fs_radar_options.xml
+++ b/indra/newview/skins/default/xui/pl/menu_fs_radar_options.xml
@@ -23,5 +23,6 @@
 	<menu_item_check label="Powiadom o wyjściu osoby z zasięgu regionu" name="RadarReportSimRangeLeave"/>
 	<menu_item_check label="Wysyłaj alerty wejść do skryptów" name="RadarEnterChannelAlert"/>
 	<menu_item_check label="Wysyłaj alerty wyjść do skryptów" name="RadarLeaveChannelAlert"/>
+	<menu_item_check label="Wspomaganie radaru za pomocą Mostu LSL" name="FSRadarEnhanceByBridge"/>
 	<menu_item_call label="Pokaż zablokowanych Rezydentów i obiekty" name="show_blocked_list"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_chat.xml b/indra/newview/skins/default/xui/pl/panel_preferences_chat.xml
index 214245a0b0..dde6621107 100755
--- a/indra/newview/skins/default/xui/pl/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/pl/panel_preferences_chat.xml
@@ -225,6 +225,7 @@
 			<button name="Def_UISndRadarSimLeave" tool_tip="Resetuj do domyślnego UUID."/>
 			<check_box name="RadarEnterChannelAlert" label="Zgłaszaj alerty wejść skryptom"/>
 			<check_box name="RadarLeaveChannelAlert" label="Zgłaszaj alerty wyjść skryptom"/>
+			<check_box name="FSRadarEnhanceByBridge" label="Wspomaganie radaru za pomocą Mostu LSL" tool_tip="Gdy ta opcja jest włączona, to funkcje radaru odpowiedzialne za ustalanie wysokości na jakiej znajdują się awatary są wspomagane przez Most LSL - zwłaszcza gdy jest ona duża i osoby są poza polem widzenia."/>
 		</panel>
 		<panel label="Detektor słów" name="ChatKeywordAlerts">
 			<check_box name="FSKeywordOn" label="Włącz detektor słów"/>
diff --git a/indra/newview/skins/vintage/xui/en/panel_people.xml b/indra/newview/skins/vintage/xui/en/panel_people.xml
index e8f4833539..8185cfe2da 100644
--- a/indra/newview/skins/vintage/xui/en/panel_people.xml
+++ b/indra/newview/skins/vintage/xui/en/panel_people.xml
@@ -248,6 +248,19 @@ Looking for people to hang out with? Use the search box to find topics or conten
 						layout="topleft"
 						follows="left|top"/>
 
+					<check_box
+						enabled_control="UseLSLBridge"
+						label="Enhance radar with LSL-Client Bridge"
+						tool_tip="If this is enabled, radar functions responsible for determining avatar locations at high altitudes are assisted by the LSL-Client Bridge, particularly when they're beyond draw distance."
+						left="0"
+						top_pad="2"
+						name="FSRadarEnhanceByBridge"
+						control_name="FSRadarEnhanceByBridge"
+						right="-1"
+						height="16"
+						layout="topleft"
+						follows="left|top"/>
+
 					<check_box
 						label="Color names based on distance"
 						left="0"
diff --git a/indra/newview/skins/vintage/xui/pl/panel_people.xml b/indra/newview/skins/vintage/xui/pl/panel_people.xml
index 5c704be51f..b6b3738e49 100644
--- a/indra/newview/skins/vintage/xui/pl/panel_people.xml
+++ b/indra/newview/skins/vintage/xui/pl/panel_people.xml
@@ -48,6 +48,7 @@ Chcesz spotkać ludzi? Spróbuj użyć [secondlife:///app/worldmap Mapy Świata]
 					<check_box label="Zgłaszaj wyjście z przestrzeni regionu" name="RadarReportSimRangeLeave"/>
 					<check_box label="Zgłaszaj alerty wejść skryptom" name="RadarEnterChannelAlert"/>
 					<check_box label="Zgłaszaj alerty wyjść skryptom" name="RadarLeaveChannelAlert"/>
+					<check_box label="Wspomaganie radaru za pomocą Mostu LSL" tool_tip="Gdy ta opcja jest włączona, to funkcje radaru odpowiedzialne za ustalanie wysokości na jakiej znajdują się awatary są wspomagane przez Most LSL - zwłaszcza gdy jest ona duża i osoby są poza polem widzenia." name="FSRadarEnhanceByBridge"/>
 					<check_box label="Koloruj imiona bazując na odległości" name="FSRadarColorNamesByDistance"/>
 					<check_box label="Ogranicz odl.:" tool_tip="Ogranicza wyniki do określonego dystansu" name="LimitRadarByRange" />
 					<text name="radarmap_range_label" value="Format imion radaru:"/>