Merge remote-tracking branch 'jacek/next' into next

Conflicts (manualy merged):
	linden/indra/newview/app_settings/default_grids.xml
	linden/indra/newview/primbackup.cpp
	linden/indra/newview/skins/default/xui/en-us/floater_about.xml
	linden/indra/newview/skins/default/xui/en-us/notifications.xml

InWorldz specific crap removed.

1 files changed, 2 insertions, 2 deletions

diff --git a/linden/indra/newview/llmanipscale.cpp b/linden/indra/newview/llmanipscale.cpp
index 0c79a35..fe6bc26 100644
--- a/linden/indra/newview/llmanipscale.cpp
+++ b/linden/indra/newview/llmanipscale.cpp
@@ -236,9 +236,9 @@ void LLManipScale::render()
                         range_from_agent = dist_vec(gAgent.getPositionAgent(), center_agent);
 
                         // Don't draw manip if object too far away
-                        if (gSavedSettings.getBOOL("LimitSelectDistance"))
+                        if (!gSavedSettings.getBOOL("DisableMaxBuildConstraints") && gSavedSettings.getBOOL("LimitSelectDistance"))
                         {
-                                F32 max_select_distance = gSavedSettings.getF32("MaxSelectDistance");
+                                F32 max_select_distance = gHippoLimits->getMaxSelectDistance();
                                 if (range_from_agent > max_select_distance)
                                 {
                                         return;