Merged with FS-specific fixes

.hgeol

@@ -1,12 +0,0 @@
-[repository]
-native = LF
-
-[patterns]
-path:indra/lscript/lscript_compile/windows/unistd.h = CRLF
-path:indra/newview/installers/windows/FILES_ARE_UNICODE_UTF-16LE.txt = CRLF
-path:indra/tools/vstool/README.txt = CRLF
-**.h = native
-**.cpp = native
-**.py = native
-**.xml = native
-**.txt = native

indra/newview/fsnearbychathub.cpp

@@ -44,6 +44,7 @@
 #include "llviewerkeyboard.h"
 #include "llviewerstats.h"
 #include "llworld.h"
+#include "rlvactions.h"
 #include "rlvhandler.h"
 
 static const U32 NAME_PREDICTION_MINIMUM_LENGTH = 3;
@@ -129,7 +130,7 @@ void send_chat_from_viewer(std::string utf8_out_text, EChatType type, S32 channe
 		else
 		{
 			// Don't allow chat on a non-public channel if sendchannel restricted (unless the channel is an exception)
-			if ( (gRlvHandler.hasBehaviour(RLV_BHVR_SENDCHANNEL)) && (!gRlvHandler.isException(RLV_BHVR_SENDCHANNEL, channel)) )
+			if (!RlvActions::canSendChannel(channel))
 				return;
 
 			// Don't allow chat on debug channel if @sendchat, @redirchat or @rediremote restricted (shows as public chat on viewers)

indra/newview/llagentcamera.cpp

@@ -1989,7 +1989,7 @@ LLVector3d LLAgentCamera::calcCameraPositionTargetGlobal(BOOL *hit_limit)
 //
 //				isConstrained = TRUE;
 //			}
-	
+	}
 
 // [RLVa:KB] - Checked: RLVa-2.0.0
 	if ( (CAMERA_MODE_THIRD_PERSON == mCameraMode) && (RlvActions::isRlvEnabled()) && (RlvActions::isCameraDistanceClamped()) )
@@ -2039,7 +2039,7 @@ LLVector3d LLAgentCamera::calcCameraPositionTargetGlobal(BOOL *hit_limit)
 		camera_position_global.mdV[VZ] = camera_land_height + camera_min_off_ground;
 		isConstrained = TRUE;
 	}
-	}
+
 
 	if (hit_limit)
 	{