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, 3 insertions, 1 deletions

diff --git a/linden/indra/newview/llviewercamera.cpp b/linden/indra/newview/llviewercamera.cpp
index 16f6e57..fecab65 100644
--- a/linden/indra/newview/llviewercamera.cpp
+++ b/linden/indra/newview/llviewercamera.cpp
@@ -51,6 +51,8 @@
 #include "lltoolmgr.h"
 #include "llviewerjoystick.h"
 
+#include "hippolimits.h"
+
 //glu pick matrix implementation borrowed from Mesa3D
 glh::matrix4f gl_pick_matrix(GLfloat x, GLfloat y, GLfloat width, GLfloat height, GLint* viewport)
 {
@@ -334,7 +336,7 @@ void LLViewerCamera::setPerspective(BOOL for_selection,
                 if (limit_select_distance)
                 {
                         // ...select distance from control
-                        z_far = gSavedSettings.getF32("MaxSelectDistance");
+                        z_far = gHippoLimits->getMaxSelectDistance();
                 }
                 else
                 {