diff --git a/indra/newview/llpanelobject.cpp b/indra/newview/llpanelobject.cpp
index 7518599949..b724fbd43f 100644
--- a/indra/newview/llpanelobject.cpp
+++ b/indra/newview/llpanelobject.cpp
@@ -1177,12 +1177,12 @@ void LLPanelObject::getState( )
 			//      Everything else are the special FS types and profiles
 			if (selected_item == MI_BOX || selected_item == MI_CYLINDER || selected_item == MI_PRISM)
 			{
-				mSpinScaleX->set( 1.f - scale_x );
-				mSpinScaleY->set( 1.f - scale_y );
-				mSpinScaleX->setMinValue(-1.f);
-				mSpinScaleX->setMaxValue(1.f);
-				mSpinScaleY->setMinValue(-1.f);
-				mSpinScaleY->setMaxValue(1.f);
+				mSpinScaleX->set( 1.f - scale_x );
+				mSpinScaleY->set( 1.f - scale_y );
+				mSpinScaleX->setMinValue(-1.f);
+				mSpinScaleX->setMaxValue(1.f);
+				mSpinScaleY->setMinValue(-1.f);
+				mSpinScaleY->setMaxValue(1.f);
 			}
 			else
 			{
@@ -1539,6 +1539,141 @@ void LLPanelObject::activateMeshFields(LLViewerObject * objectp)
 		mComboLOD->setEnabled(TRUE);
 		mComboLOD->setVisible(TRUE);
 	}
+
+	F32 radius;
+//	F32 distance;
+
+	if (objectp->mDrawable->isState(LLDrawable::RIGGED))
+	{
+		LLVOAvatar* avatar = objectp->getAvatar();
+
+		// Not sure how this can really happen, but alas it does. Better exit here than crashing.
+		if (!avatar || !avatar->mDrawable)
+		{
+			return;
+		}
+		radius = avatar->getBinRadius();
+	}
+	else
+	{
+		radius = objectp->getVolume() ? objectp->getVolume()->mLODScaleBias.scaledVec(objectp->getScale()).length() : objectp->getScale().length();
+	}
+
+	static const F32 max_distance = 512.f;
+	F32 factor;
+	F32 dlowest = llmin(radius / 0.03f, max_distance);
+	F32 dlow = llmin(radius / 0.06f, max_distance);
+	F32 dmid = llmin(radius / 0.24f, max_distance);
+
+	childSetVisible("object_radius", TRUE);
+	LLTextBox* tb = getChild<LLTextBox>("object_radius_value");
+	if (tb)
+	{
+		tb->setText(llformat("%f", radius));
+		tb->setVisible(TRUE);
+	}
+	
+	childSetVisible("LOD_swap_defaults_label", TRUE);
+	childSetVisible("LOD_swap_usr_label", TRUE);
+	childSetVisible("LOD_swap_factors_label", TRUE);
+	childSetVisible("LOD_swap_label", TRUE);
+	childSetVisible("LOD_swap_usr_label", TRUE);
+	childSetVisible("LOD_swap_H2M_label", TRUE);
+	childSetVisible("LOD_swap_M2L_label", TRUE);
+	childSetVisible("LOD_swap_L2I_label", TRUE);
+	childSetVisible("LODSwapTableDscriptionsText", TRUE);
+	childSetVisible("ObjectLODbehaviourLabel", TRUE);
+
+	factor = 1.125; // LL default for most people http://wiki.phoenixviewer.com/support:whirly_fizzle#lod_comparison
+	tb = getChild<LLTextBox>("LOD_swap_ll_default");
+	if (tb)
+	{
+		LLUIString factor_string = tb->getText();
+		factor_string.setArg("[FACTOR]", llformat("%.2f", factor));
+		tb->setText(factor_string.getString());
+		tb->setVisible(TRUE);
+	}
+	tb = getChild<LLTextBox>("LOD_swap_ll_H2M");
+	if (tb)
+	{
+		tb->setText(llformat("%.1f", factor*dmid));
+		tb->setVisible(TRUE);
+		tb->setEnabled(TRUE);
+	}
+	tb = getChild<LLTextBox>("LOD_swap_ll_M2L");
+	if (tb)
+	{
+		tb->setText(llformat("%.1f", factor*dlow));
+		tb->setVisible(TRUE);
+		tb->setEnabled(TRUE);
+	}
+	tb = getChild<LLTextBox>("LOD_swap_ll_L2I");
+	if (tb)
+	{
+		tb->setText(llformat("%.1f", factor*dlowest));
+		tb->setVisible(TRUE);
+		tb->setEnabled(TRUE);
+	}
+	factor = 2.0;
+	tb = getChild<LLTextBox>("LOD_swap_fs_default");
+	if (tb)
+	{
+		LLUIString factor_string = tb->getText();
+		factor_string.setArg("[FACTOR]", llformat("%.2f", factor));
+		tb->setText(factor_string.getString());
+		tb->setVisible(TRUE);
+	}
+	tb = getChild<LLTextBox>("LOD_swap_fs_H2M");
+	if (tb)
+	{
+		tb->setText(llformat("%.1f", factor*dmid));
+		tb->setVisible(TRUE);
+		tb->setEnabled(TRUE);
+	}
+	tb = getChild<LLTextBox>("LOD_swap_fs_M2L");
+	if (tb)
+	{
+		tb->setText(llformat("%.1f", factor*dlow));
+		tb->setVisible(TRUE);
+		tb->setEnabled(TRUE);
+	}
+	tb = getChild<LLTextBox>("LOD_swap_fs_L2I");
+	if (tb)
+	{
+		tb->setText(llformat("%.1f", factor*dlowest));
+		tb->setVisible(TRUE);
+		tb->setEnabled(TRUE);
+	}
+	factor = LLVOVolume::sLODFactor;
+	tb = getChild<LLTextBox>("LOD_swap_usr_current");
+	if (tb)
+	{
+		LLUIString factor_string = getString("user_lod_label_string");
+		factor_string.setArg("[FACTOR]", llformat("%.2f", factor));
+		tb->setText(factor_string.getString());
+		tb->setVisible(TRUE);
+	}
+	tb = getChild<LLTextBox>("LOD_swap_usr_H2M");
+	if (tb)
+	{
+		tb->setText(llformat("%.1f", factor*dmid));
+		tb->setVisible(TRUE);
+		tb->setEnabled(TRUE);
+	}
+	tb = getChild<LLTextBox>("LOD_swap_usr_M2L");
+	if (tb)
+	{
+		tb->setText(llformat("%.1f", factor*dlow));
+		tb->setVisible(TRUE);
+		tb->setEnabled(TRUE);
+	}
+	tb = getChild<LLTextBox>("LOD_swap_usr_L2I");
+	if (tb)
+	{
+		tb->setText(llformat("%.1f", factor*dlowest));
+		tb->setVisible(TRUE);
+		tb->setEnabled(TRUE);
+	}
 }
 
 void LLPanelObject::deactivateMeshFields()
@@ -1560,7 +1695,6 @@ void LLPanelObject::deactivateMeshFields()
 	childSetVisible("med_lod_label", FALSE);
 	childSetVisible("low_lod_label", FALSE);
 	childSetVisible("lowest_lod_label", FALSE);
-
 	// reset the debug setting as we are editing a new object
 	gSavedSettings.setS32("ShowSpecificLODInEdit", -1);
 	// </FS:Beq>
@@ -1572,6 +1706,93 @@ void LLPanelObject::deactivateMeshFields()
 		mComboLOD->setEnabled(FALSE);
 		mComboLOD->setVisible(FALSE);
 	}
+	childSetVisible("object_radius", FALSE);
+	LLTextBox* tb = getChild<LLTextBox>("object_radius_value");
+	if (tb)
+	{
+		tb->setVisible(FALSE);
+	}
+	
+	childSetVisible("ObjectLODbehaviourLabel", FALSE);
+	childSetVisible("LOD_swap_defaults_label", FALSE);
+	childSetVisible("LOD_swap_factors_label", FALSE);
+	childSetVisible("LOD_swap_usr_label", FALSE);
+	childSetVisible("LOD_swap_label", FALSE);
+	childSetVisible("LOD_swap_usr_label", FALSE);
+	childSetVisible("LOD_swap_H2M_label", FALSE);
+	childSetVisible("LOD_swap_M2L_label", FALSE);
+	childSetVisible("LOD_swap_L2I_label", FALSE);
+	childSetVisible("LODSwapTableDscriptionsText", FALSE);
+
+	tb = getChild<LLTextBox>("LOD_swap_ll_default");
+	if (tb)
+	{
+		tb->setVisible(FALSE);
+	}
+	tb = getChild<LLTextBox>("LOD_swap_ll_H2M");
+	if (tb)
+	{
+		tb->setVisible(FALSE);
+		tb->setEnabled(FALSE);
+	}
+	tb = getChild<LLTextBox>("LOD_swap_ll_M2L");
+	if (tb)
+	{
+		tb->setVisible(FALSE);
+		tb->setEnabled(FALSE);
+	}
+	tb = getChild<LLTextBox>("LOD_swap_ll_L2I");
+	if (tb)
+	{
+		tb->setVisible(FALSE);
+		tb->setEnabled(FALSE);
+	}
+	tb = getChild<LLTextBox>("LOD_swap_fs_default");
+	if (tb)
+	{
+		tb->setVisible(FALSE);
+	}
+	tb = getChild<LLTextBox>("LOD_swap_fs_H2M");
+	if (tb)
+	{
+		tb->setVisible(FALSE);
+		tb->setEnabled(FALSE);
+	}
+	tb = getChild<LLTextBox>("LOD_swap_fs_M2L");
+	if (tb)
+	{
+		tb->setVisible(FALSE);
+		tb->setEnabled(FALSE);
+	}
+	tb = getChild<LLTextBox>("LOD_swap_fs_L2I");
+	if (tb)
+	{
+		tb->setVisible(FALSE);
+		tb->setEnabled(FALSE);
+	}
+	tb = getChild<LLTextBox>("LOD_swap_usr_current");
+	if (tb)
+	{
+		tb->setVisible(FALSE);
+	}
+	tb = getChild<LLTextBox>("LOD_swap_usr_H2M");
+	if (tb)
+	{
+		tb->setVisible(FALSE);
+		tb->setEnabled(FALSE);
+	}
+	tb = getChild<LLTextBox>("LOD_swap_usr_M2L");
+	if (tb)
+	{
+		tb->setVisible(FALSE);
+		tb->setEnabled(FALSE);
+	}
+	tb = getChild<LLTextBox>("LOD_swap_usr_L2I");
+	if (tb)
+	{
+		tb->setVisible(FALSE);
+		tb->setEnabled(FALSE);
+	}
 }
 //</FS:Beq>
 
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index 9a2f9155da..91106607df 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -4811,7 +4811,14 @@ void LLViewerWindow::renderSelections( BOOL for_gl_pick, BOOL pick_parcel_walls,
 				{
 					virtual bool apply(LLViewerObject* object)
 					{
-						object->mDrawable->getVOVolume()->forceLOD(showSpecificLOD);
+						if (object->getPCode() == LL_PCODE_VOLUME)
+						{
+							LLVOVolume* vol = static_cast<LLVOVolume*>(object);
+							if (vol->isMesh())
+							{
+								vol->forceLOD(showSpecificLOD);
+							}
+						}
 						return true;
 					}
 				} func;
diff --git a/indra/newview/skins/default/xui/en/floater_model_preview.xml b/indra/newview/skins/default/xui/en/floater_model_preview.xml
index ef11435260..33bce0321a 100644
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -799,6 +799,7 @@
                         <combo_item name="physics_medium"> Medium </combo_item>
                         <combo_item name="physics_low">    Low    </combo_item>
                         <combo_item name="physics_lowest"> Lowest </combo_item>
+                        <combo_item name="basic_box">      Simple Box  </combo_item>
                         <combo_item name="load_from_file"> From file   </combo_item>
                     </combo_box>
                     <line_editor
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index a46ac50bd5..d079389fa3 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -2593,6 +2593,267 @@ even though the user gets a free copy.
                name="Lowest/Imposter"
                value="0" />
         </combo_box>
+        <text
+          follows="left|top"
+          height="16"
+          layout="topleft"
+          halign="left"
+          top_pad="16"
+          left="125"
+          name="ObjectLODbehaviourLabel"
+          value="Object LOD behaviour:"
+          visible="true"
+          width="180"/>
+        <text
+          follows="left|top"
+          height="16"
+          layout="topleft"
+          halign="left"
+          top_pad="10"
+          left="125"
+          name="object_radius"
+          top_delta="0"
+          value="Object radius : "
+          visible="false"
+          width="80" />
+        <text
+          follows="left|top"
+          height="16"
+          layout="topleft"
+          left_pad="10"
+          halign="right"
+          name="object_radius_value"
+          top_delta="0"
+          value="--"
+          visible="false"
+          width="60" />
+        <text
+          follows="left|top"
+          height="16"
+          layout="topleft"
+          left="190"
+          halign="center"
+          name="LOD_swap_factors_label"
+          top_pad="3"
+          value="LOD Factors"
+          visible="true"
+          width="100" />
+        <text
+          follows="left|top"
+          height="16"
+          layout="topleft"
+          left="190"
+          halign="center"
+          name="LOD_swap_defaults_label"
+          top_pad="3"
+          value="Default"
+          tool_tip="The default LOD factor setting that will be applied by most viewers."
+          visible="true"
+          width="60" />
+        <text
+          follows="left|top"
+          height="16"
+          layout="topleft"
+          left_pad="5"
+          halign="center"
+          name="LOD_swap_usr_label"
+          top_delta="0"
+          tool_tip="Your current setting, taken from RenderVolumeLODFactor"
+          value="Yours"
+          visible="true"
+          width="30" />
+        <text
+          follows="left|top"
+          height="16"
+          layout="topleft"
+          left="125"
+          halign="left"
+          name="LOD_swap_label"
+          top_pad="3"
+          value="LOD Swap"
+          visible="false"
+          width="60" />
+        <text
+          follows="left|top"
+          height="16"
+          layout="topleft"
+          left_pad="5"
+          halign="center"
+          name="LOD_swap_ll_default"
+          top_delta="0"
+          tool_tip="Linden Lab Second Life Viewer default"
+          value="LL"
+          visible="false"
+          width="30" />
+        <text
+          follows="left|top"
+          height="16"
+          layout="topleft"
+          left_pad="5"
+          halign="center"
+          name="LOD_swap_fs_default"
+          tool_tip="Firestorm default"
+          top_delta="0"
+          value="FS"
+          visible="false"
+          width="30" />
+        <string name="user_lod_label_string">[FACTOR]</string>
+        <text
+          follows="left|top"
+          height="16"
+          layout="topleft"
+          left_pad="5"
+          halign="center"
+          name="LOD_swap_usr_current"
+          top_delta="0"
+          tool_tip="Your current LOD Factor"
+          value="[FACTOR]"
+          visible="false"
+          width="30" />
+        <text
+          follows="left|top"
+          height="16"
+          layout="topleft"
+          left="125"
+          halign="center"
+          name="LOD_swap_H2M_label"
+          top_pad="3"
+          value="High ↔ Med"
+          visible="false"
+          width="65" />
+        <text
+          follows="left|top"
+          height="16"
+          layout="topleft"
+          left_pad="0"
+          halign="center"
+          name="LOD_swap_ll_H2M"
+          top_delta="0"
+          value="--"
+          visible="false"
+          width="30" />
+        <text
+          follows="left|top"
+          height="16"
+          layout="topleft"
+          left_pad="5"
+          halign="center"
+          name="LOD_swap_fs_H2M"
+          top_delta="0"
+          value="--"
+          visible="false"
+          width="30" />
+        <text
+          follows="left|top"
+          height="16"
+          layout="topleft"
+          left_pad="5"
+          halign="center"
+          name="LOD_swap_usr_H2M"
+          top_delta="0"
+          value="--"
+          visible="false"
+          width="30" />
+        <text
+          follows="left|top"
+          height="16"
+          layout="topleft"
+          left="125"
+          halign="center"
+          name="LOD_swap_M2L_label"
+          top_pad="3"
+          value="Med ↔ Low"
+          visible="false"
+          width="60" />
+        <text
+          follows="left|top"
+          height="16"
+          layout="topleft"
+          left_pad="5"
+          halign="center"
+          name="LOD_swap_ll_M2L"
+          top_delta="0"
+          value="--"
+          visible="false"
+          width="30" />
+        <text
+          follows="left|top"
+          height="16"
+          layout="topleft"
+          left_pad="5"
+          halign="center"
+          name="LOD_swap_fs_M2L"
+          top_delta="0"
+          value="--"
+          visible="false"
+          width="30" />
+        <text
+          follows="left|top"
+          height="16"
+          layout="topleft"
+          left_pad="5"
+          halign="center"
+          name="LOD_swap_usr_M2L"
+          top_delta="0"
+          value="--"
+          visible="false"
+          width="30" />
+        <text
+          follows="left|top"
+          height="16"
+          layout="topleft"
+          left="125"
+          halign="center"
+          name="LOD_swap_L2I_label"
+          top_pad="3"
+          value="Low ↔ Lwst"
+          visible="false"
+          width="60" />
+        <text
+         follows="left|top"
+         height="16"
+         layout="topleft"
+         left_pad="5"
+         halign="center"
+         name="LOD_swap_ll_L2I"
+         top_delta="0"
+         value="--"
+         visible="false"
+         width="30" />
+        <text
+          follows="left|top"
+          height="16"
+          layout="topleft"
+          left_pad="5"
+          halign="center"
+          name="LOD_swap_fs_L2I"
+          top_delta="0"
+          value="--"
+          visible="false"
+          width="30" />
+        <text
+          follows="left|top"
+          height="16"
+          layout="topleft"
+          left_pad="5"
+          halign="center"
+          name="LOD_swap_usr_L2I"
+          top_delta="0"
+          value="--"
+          visible="false"
+          width="30" />
+        <text
+          name="LODSwapTableDscriptionsText"
+          follows="top|left"
+          layout="topleft"
+          left="125"
+          right="-1"
+          word_wrap="true"
+          top_pad="15"
+          tool_tip="Best practice: Creators should ensure good LOD behaviour for Default settings across all viewers."
+          height="100">
+        This table shows the LOD change boundaries in metres from the camera.
+        </text>
         <!-- /FS:Beq end of Mesh info section-->
         </panel>
         <panel
diff --git a/indra/newview/skins/starlight/xui/en/floater_tools.xml b/indra/newview/skins/starlight/xui/en/floater_tools.xml
index 8aef7e9193..9d1032b932 100644
--- a/indra/newview/skins/starlight/xui/en/floater_tools.xml
+++ b/indra/newview/skins/starlight/xui/en/floater_tools.xml
@@ -2651,6 +2651,268 @@ even though the user gets a free copy.
                name="Lowest/Imposter"
                value="0" />
         </combo_box>
+        <text
+   follows="left|top"
+   height="16"
+   layout="topleft"
+   halign="left"
+   top_pad="16"
+   left="125"
+   name="ObjectLODbehaviourLabel"
+   value="Object LOD behaviour:"
+   visible="true"
+   width="180"/>
+        <text
+          follows="left|top"
+          height="16"
+          layout="topleft"
+          halign="left"
+          top_pad="10"
+          left="125"
+          name="object_radius"
+          top_delta="0"
+          value="Object radius : "
+          visible="false"
+          width="80" />
+        <text
+          follows="left|top"
+          height="16"
+          layout="topleft"
+          left_pad="10"
+          halign="right"
+          name="object_radius_value"
+          top_delta="0"
+          value="--"
+          visible="false"
+          width="60" />
+        <text
+          follows="left|top"
+          height="16"
+          layout="topleft"
+          left="190"
+          halign="center"
+          name="LOD_swap_factors_label"
+          top_pad="3"
+          value="LOD Factors"
+          visible="true"
+          width="100" />
+        <text
+          follows="left|top"
+          height="16"
+          layout="topleft"
+          left="190"
+          halign="center"
+          name="LOD_swap_defaults_label"
+          top_pad="3"
+          value="Default"
+          tool_tip="The default LOD factor setting that will be applied by most viewers."
+          visible="true"
+          width="60" />
+        <text
+          follows="left|top"
+          height="16"
+          layout="topleft"
+          left_pad="5"
+          halign="center"
+          name="LOD_swap_usr_label"
+          top_delta="0"
+          tool_tip="Your current setting, taken from RenderVolumeLODFactor"
+          value="Yours"
+          visible="true"
+          width="30" />
+        <text
+          follows="left|top"
+          height="16"
+          layout="topleft"
+          left="125"
+          halign="left"
+          name="LOD_swap_label"
+          top_pad="3"
+          value="LOD Swap"
+          visible="false"
+          width="60" />
+        <text
+          follows="left|top"
+          height="16"
+          layout="topleft"
+          left_pad="5"
+          halign="center"
+          name="LOD_swap_ll_default"
+          top_delta="0"
+          tool_tip="Linden Lab Second Life Viewer default"
+          value="LL"
+          visible="false"
+          width="30" />
+        <text
+          follows="left|top"
+          height="16"
+          layout="topleft"
+          left_pad="5"
+          halign="center"
+          name="LOD_swap_fs_default"
+          tool_tip="Firestorm default"
+          top_delta="0"
+          value="FS"
+          visible="false"
+          width="30" />
+        <string name="user_lod_label_string">[FACTOR]</string>
+        <text
+          follows="left|top"
+          height="16"
+          layout="topleft"
+          left_pad="5"
+          halign="center"
+          name="LOD_swap_usr_current"
+          top_delta="0"
+          tool_tip="Your current LOD Factor"
+          value="[FACTOR]"
+          visible="false"
+          width="30" />
+        <text
+          follows="left|top"
+          height="16"
+          layout="topleft"
+          left="125"
+          halign="center"
+          name="LOD_swap_H2M_label"
+          top_pad="3"
+          value="High ↔ Med"
+          visible="false"
+          width="65" />
+        <text
+          follows="left|top"
+          height="16"
+          layout="topleft"
+          left_pad="0"
+          halign="center"
+          name="LOD_swap_ll_H2M"
+          top_delta="0"
+          value="--"
+          visible="false"
+          width="30" />
+        <text
+          follows="left|top"
+          height="16"
+          layout="topleft"
+          left_pad="5"
+          halign="center"
+          name="LOD_swap_fs_H2M"
+          top_delta="0"
+          value="--"
+          visible="false"
+          width="30" />
+        <text
+          follows="left|top"
+          height="16"
+          layout="topleft"
+          left_pad="5"
+          halign="center"
+          name="LOD_swap_usr_H2M"
+          top_delta="0"
+          value="--"
+          visible="false"
+          width="30" />
+        <text
+          follows="left|top"
+          height="16"
+          layout="topleft"
+          left="125"
+          halign="center"
+          name="LOD_swap_M2L_label"
+          top_pad="3"
+          value="Med ↔ Low"
+          visible="false"
+          width="60" />
+        <text
+          follows="left|top"
+          height="16"
+          layout="topleft"
+          left_pad="5"
+          halign="center"
+          name="LOD_swap_ll_M2L"
+          top_delta="0"
+          value="--"
+          visible="false"
+          width="30" />
+        <text
+          follows="left|top"
+          height="16"
+          layout="topleft"
+          left_pad="5"
+          halign="center"
+          name="LOD_swap_fs_M2L"
+          top_delta="0"
+          value="--"
+          visible="false"
+          width="30" />
+        <text
+          follows="left|top"
+          height="16"
+          layout="topleft"
+          left_pad="5"
+          halign="center"
+          name="LOD_swap_usr_M2L"
+          top_delta="0"
+          value="--"
+          visible="false"
+          width="30" />
+        <text
+          follows="left|top"
+          height="16"
+          layout="topleft"
+          left="125"
+          halign="center"
+          name="LOD_swap_L2I_label"
+          top_pad="3"
+          value="Low ↔ Lwst"
+          visible="false"
+          width="60" />
+        <text
+         follows="left|top"
+         height="16"
+         layout="topleft"
+         left_pad="5"
+         halign="center"
+         name="LOD_swap_ll_L2I"
+         top_delta="0"
+         value="--"
+         visible="false"
+         width="30" />
+        <text
+          follows="left|top"
+          height="16"
+          layout="topleft"
+          left_pad="5"
+          halign="center"
+          name="LOD_swap_fs_L2I"
+          top_delta="0"
+          value="--"
+          visible="false"
+          width="30" />
+        <text
+          follows="left|top"
+          height="16"
+          layout="topleft"
+          left_pad="5"
+          halign="center"
+          name="LOD_swap_usr_L2I"
+          top_delta="0"
+          value="--"
+          visible="false"
+          width="30" />
+        <text
+          name="LODSwapTableDscriptionsText"
+          follows="top|left"
+          layout="topleft"
+          left="125"
+          right="-1"
+          word_wrap="true"
+          top_pad="15"
+          tool_tip="Best practice: Creators should ensure good LOD behaviour for Default settings across all viewers."
+          height="100">
+          This table shows the LOD change boundaries in metres from the camera.
+        </text>
+
         <!-- /FS:Beq end of Mesh info section-->
       </panel>
         <panel
diff --git a/indra/newview/skins/starlightcui/xui/en/floater_tools.xml b/indra/newview/skins/starlightcui/xui/en/floater_tools.xml
index f5adee4d4a..08f7ac7ff7 100644
--- a/indra/newview/skins/starlightcui/xui/en/floater_tools.xml
+++ b/indra/newview/skins/starlightcui/xui/en/floater_tools.xml
@@ -2651,6 +2651,268 @@ even though the user gets a free copy.
                name="Lowest/Imposter"
                value="0" />
         </combo_box>
+        <text
+   follows="left|top"
+   height="16"
+   layout="topleft"
+   halign="left"
+   top_pad="16"
+   left="125"
+   name="ObjectLODbehaviourLabel"
+   value="Object LOD behaviour:"
+   visible="true"
+   width="180"/>
+        <text
+          follows="left|top"
+          height="16"
+          layout="topleft"
+          halign="left"
+          top_pad="10"
+          left="125"
+          name="object_radius"
+          top_delta="0"
+          value="Object radius : "
+          visible="false"
+          width="80" />
+        <text
+          follows="left|top"
+          height="16"
+          layout="topleft"
+          left_pad="10"
+          halign="right"
+          name="object_radius_value"
+          top_delta="0"
+          value="--"
+          visible="false"
+          width="60" />
+        <text
+          follows="left|top"
+          height="16"
+          layout="topleft"
+          left="190"
+          halign="center"
+          name="LOD_swap_factors_label"
+          top_pad="3"
+          value="LOD Factors"
+          visible="true"
+          width="100" />
+        <text
+          follows="left|top"
+          height="16"
+          layout="topleft"
+          left="190"
+          halign="center"
+          name="LOD_swap_defaults_label"
+          top_pad="3"
+          value="Default"
+          tool_tip="The default LOD factor setting that will be applied by most viewers."
+          visible="true"
+          width="60" />
+        <text
+          follows="left|top"
+          height="16"
+          layout="topleft"
+          left_pad="5"
+          halign="center"
+          name="LOD_swap_usr_label"
+          top_delta="0"
+          tool_tip="Your current setting, taken from RenderVolumeLODFactor"
+          value="Yours"
+          visible="true"
+          width="30" />
+        <text
+          follows="left|top"
+          height="16"
+          layout="topleft"
+          left="125"
+          halign="left"
+          name="LOD_swap_label"
+          top_pad="3"
+          value="LOD Swap"
+          visible="false"
+          width="60" />
+        <text
+          follows="left|top"
+          height="16"
+          layout="topleft"
+          left_pad="5"
+          halign="center"
+          name="LOD_swap_ll_default"
+          top_delta="0"
+          tool_tip="Linden Lab Second Life Viewer default"
+          value="LL"
+          visible="false"
+          width="30" />
+        <text
+          follows="left|top"
+          height="16"
+          layout="topleft"
+          left_pad="5"
+          halign="center"
+          name="LOD_swap_fs_default"
+          tool_tip="Firestorm default"
+          top_delta="0"
+          value="FS"
+          visible="false"
+          width="30" />
+        <string name="user_lod_label_string">[FACTOR]</string>
+        <text
+          follows="left|top"
+          height="16"
+          layout="topleft"
+          left_pad="5"
+          halign="center"
+          name="LOD_swap_usr_current"
+          top_delta="0"
+          tool_tip="Your current LOD Factor"
+          value="[FACTOR]"
+          visible="false"
+          width="30" />
+        <text
+          follows="left|top"
+          height="16"
+          layout="topleft"
+          left="125"
+          halign="center"
+          name="LOD_swap_H2M_label"
+          top_pad="3"
+          value="High ↔ Med"
+          visible="false"
+          width="65" />
+        <text
+          follows="left|top"
+          height="16"
+          layout="topleft"
+          left_pad="0"
+          halign="center"
+          name="LOD_swap_ll_H2M"
+          top_delta="0"
+          value="--"
+          visible="false"
+          width="30" />
+        <text
+          follows="left|top"
+          height="16"
+          layout="topleft"
+          left_pad="5"
+          halign="center"
+          name="LOD_swap_fs_H2M"
+          top_delta="0"
+          value="--"
+          visible="false"
+          width="30" />
+        <text
+          follows="left|top"
+          height="16"
+          layout="topleft"
+          left_pad="5"
+          halign="center"
+          name="LOD_swap_usr_H2M"
+          top_delta="0"
+          value="--"
+          visible="false"
+          width="30" />
+        <text
+          follows="left|top"
+          height="16"
+          layout="topleft"
+          left="125"
+          halign="center"
+          name="LOD_swap_M2L_label"
+          top_pad="3"
+          value="Med ↔ Low"
+          visible="false"
+          width="60" />
+        <text
+          follows="left|top"
+          height="16"
+          layout="topleft"
+          left_pad="5"
+          halign="center"
+          name="LOD_swap_ll_M2L"
+          top_delta="0"
+          value="--"
+          visible="false"
+          width="30" />
+        <text
+          follows="left|top"
+          height="16"
+          layout="topleft"
+          left_pad="5"
+          halign="center"
+          name="LOD_swap_fs_M2L"
+          top_delta="0"
+          value="--"
+          visible="false"
+          width="30" />
+        <text
+          follows="left|top"
+          height="16"
+          layout="topleft"
+          left_pad="5"
+          halign="center"
+          name="LOD_swap_usr_M2L"
+          top_delta="0"
+          value="--"
+          visible="false"
+          width="30" />
+        <text
+          follows="left|top"
+          height="16"
+          layout="topleft"
+          left="125"
+          halign="center"
+          name="LOD_swap_L2I_label"
+          top_pad="3"
+          value="Low ↔ Lwst"
+          visible="false"
+          width="60" />
+        <text
+         follows="left|top"
+         height="16"
+         layout="topleft"
+         left_pad="5"
+         halign="center"
+         name="LOD_swap_ll_L2I"
+         top_delta="0"
+         value="--"
+         visible="false"
+         width="30" />
+        <text
+          follows="left|top"
+          height="16"
+          layout="topleft"
+          left_pad="5"
+          halign="center"
+          name="LOD_swap_fs_L2I"
+          top_delta="0"
+          value="--"
+          visible="false"
+          width="30" />
+        <text
+          follows="left|top"
+          height="16"
+          layout="topleft"
+          left_pad="5"
+          halign="center"
+          name="LOD_swap_usr_L2I"
+          top_delta="0"
+          value="--"
+          visible="false"
+          width="30" />
+        <text
+          name="LODSwapTableDscriptionsText"
+          follows="top|left"
+          layout="topleft"
+          left="125"
+          right="-1"
+          word_wrap="true"
+          top_pad="15"
+          tool_tip="Best practice: Creators should ensure good LOD behaviour for Default settings across all viewers."
+          height="100">
+          This table shows the LOD change boundaries in metres from the camera.
+        </text>
+
         <!-- /FS:Beq end of Mesh info section-->
       </panel>
         <panel
diff --git a/indra/newview/skins/vintage/xui/en/floater_tools.xml b/indra/newview/skins/vintage/xui/en/floater_tools.xml
index d9fe580e98..d4742736bf 100644
--- a/indra/newview/skins/vintage/xui/en/floater_tools.xml
+++ b/indra/newview/skins/vintage/xui/en/floater_tools.xml
@@ -2585,6 +2585,268 @@ even though the user gets a free copy.
                name="Lowest/Imposter"
                value="0" />
         </combo_box>
+        <text
+   follows="left|top"
+   height="16"
+   layout="topleft"
+   halign="left"
+   top_pad="16"
+   left="125"
+   name="ObjectLODbehaviourLabel"
+   value="Object LOD behaviour:"
+   visible="true"
+   width="180"/>
+        <text
+          follows="left|top"
+          height="16"
+          layout="topleft"
+          halign="left"
+          top_pad="10"
+          left="125"
+          name="object_radius"
+          top_delta="0"
+          value="Object radius : "
+          visible="false"
+          width="80" />
+        <text
+          follows="left|top"
+          height="16"
+          layout="topleft"
+          left_pad="10"
+          halign="right"
+          name="object_radius_value"
+          top_delta="0"
+          value="--"
+          visible="false"
+          width="60" />
+        <text
+          follows="left|top"
+          height="16"
+          layout="topleft"
+          left="190"
+          halign="center"
+          name="LOD_swap_factors_label"
+          top_pad="3"
+          value="LOD Factors"
+          visible="true"
+          width="100" />
+        <text
+          follows="left|top"
+          height="16"
+          layout="topleft"
+          left="190"
+          halign="center"
+          name="LOD_swap_defaults_label"
+          top_pad="3"
+          value="Default"
+          tool_tip="The default LOD factor setting that will be applied by most viewers."
+          visible="true"
+          width="60" />
+        <text
+          follows="left|top"
+          height="16"
+          layout="topleft"
+          left_pad="5"
+          halign="center"
+          name="LOD_swap_usr_label"
+          top_delta="0"
+          tool_tip="Your current setting, taken from RenderVolumeLODFactor"
+          value="Yours"
+          visible="true"
+          width="30" />
+        <text
+          follows="left|top"
+          height="16"
+          layout="topleft"
+          left="125"
+          halign="left"
+          name="LOD_swap_label"
+          top_pad="3"
+          value="LOD Swap"
+          visible="false"
+          width="60" />
+        <text
+          follows="left|top"
+          height="16"
+          layout="topleft"
+          left_pad="5"
+          halign="center"
+          name="LOD_swap_ll_default"
+          top_delta="0"
+          tool_tip="Linden Lab Second Life Viewer default"
+          value="LL"
+          visible="false"
+          width="30" />
+        <text
+          follows="left|top"
+          height="16"
+          layout="topleft"
+          left_pad="5"
+          halign="center"
+          name="LOD_swap_fs_default"
+          tool_tip="Firestorm default"
+          top_delta="0"
+          value="FS"
+          visible="false"
+          width="30" />
+        <string name="user_lod_label_string">[FACTOR]</string>
+        <text
+          follows="left|top"
+          height="16"
+          layout="topleft"
+          left_pad="5"
+          halign="center"
+          name="LOD_swap_usr_current"
+          top_delta="0"
+          tool_tip="Your current LOD Factor"
+          value="[FACTOR]"
+          visible="false"
+          width="30" />
+        <text
+          follows="left|top"
+          height="16"
+          layout="topleft"
+          left="125"
+          halign="center"
+          name="LOD_swap_H2M_label"
+          top_pad="3"
+          value="High ↔ Med"
+          visible="false"
+          width="65" />
+        <text
+          follows="left|top"
+          height="16"
+          layout="topleft"
+          left_pad="0"
+          halign="center"
+          name="LOD_swap_ll_H2M"
+          top_delta="0"
+          value="--"
+          visible="false"
+          width="30" />
+        <text
+          follows="left|top"
+          height="16"
+          layout="topleft"
+          left_pad="5"
+          halign="center"
+          name="LOD_swap_fs_H2M"
+          top_delta="0"
+          value="--"
+          visible="false"
+          width="30" />
+        <text
+          follows="left|top"
+          height="16"
+          layout="topleft"
+          left_pad="5"
+          halign="center"
+          name="LOD_swap_usr_H2M"
+          top_delta="0"
+          value="--"
+          visible="false"
+          width="30" />
+        <text
+          follows="left|top"
+          height="16"
+          layout="topleft"
+          left="125"
+          halign="center"
+          name="LOD_swap_M2L_label"
+          top_pad="3"
+          value="Med ↔ Low"
+          visible="false"
+          width="60" />
+        <text
+          follows="left|top"
+          height="16"
+          layout="topleft"
+          left_pad="5"
+          halign="center"
+          name="LOD_swap_ll_M2L"
+          top_delta="0"
+          value="--"
+          visible="false"
+          width="30" />
+        <text
+          follows="left|top"
+          height="16"
+          layout="topleft"
+          left_pad="5"
+          halign="center"
+          name="LOD_swap_fs_M2L"
+          top_delta="0"
+          value="--"
+          visible="false"
+          width="30" />
+        <text
+          follows="left|top"
+          height="16"
+          layout="topleft"
+          left_pad="5"
+          halign="center"
+          name="LOD_swap_usr_M2L"
+          top_delta="0"
+          value="--"
+          visible="false"
+          width="30" />
+        <text
+          follows="left|top"
+          height="16"
+          layout="topleft"
+          left="125"
+          halign="center"
+          name="LOD_swap_L2I_label"
+          top_pad="3"
+          value="Low ↔ Lwst"
+          visible="false"
+          width="60" />
+        <text
+         follows="left|top"
+         height="16"
+         layout="topleft"
+         left_pad="5"
+         halign="center"
+         name="LOD_swap_ll_L2I"
+         top_delta="0"
+         value="--"
+         visible="false"
+         width="30" />
+        <text
+          follows="left|top"
+          height="16"
+          layout="topleft"
+          left_pad="5"
+          halign="center"
+          name="LOD_swap_fs_L2I"
+          top_delta="0"
+          value="--"
+          visible="false"
+          width="30" />
+        <text
+          follows="left|top"
+          height="16"
+          layout="topleft"
+          left_pad="5"
+          halign="center"
+          name="LOD_swap_usr_L2I"
+          top_delta="0"
+          value="--"
+          visible="false"
+          width="30" />
+        <text
+          name="LODSwapTableDscriptionsText"
+          follows="top|left"
+          layout="topleft"
+          left="125"
+          right="-1"
+          word_wrap="true"
+          top_pad="15"
+          tool_tip="Best practice: Creators should ensure good LOD behaviour for Default settings across all viewers."
+          height="100">
+          This table shows the LOD change boundaries in metres from the camera.
+        </text>
+
         <!-- /FS:Beq end of Mesh info section-->
 
       </panel>