From e057fc133542d76d2ef2570498777b35b8b0b6f3 Mon Sep 17 00:00:00 2001
From: phr0z3nt04st <phr0z3nt04st@gmail.com>
Date: Tue, 18 May 2010 19:37:50 -0500
Subject: [PATCH] Prefs updated.

---
 indra/newview/hbprefsinert.cpp                        |  3 +++
 .../default/xui/en-us/panel_preferences_inert.xml     | 11 ++++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/indra/newview/hbprefsinert.cpp b/indra/newview/hbprefsinert.cpp
index cda9a5031..dad35a489 100644
--- a/indra/newview/hbprefsinert.cpp
+++ b/indra/newview/hbprefsinert.cpp
@@ -59,6 +59,7 @@ private:
 	BOOL mDoubleClickTeleport;
 	BOOL mHideNotificationsInChat;
 	BOOL mPlayTypingSound;
+	BOOL mDisablePointAtAndBeam;
 	BOOL mPrivateLookAt;
 	BOOL mFetchInventoryOnLogin;
 	BOOL mSecondsInChatAndIMs;
@@ -111,6 +112,7 @@ void LLPrefsInertImpl::refreshValues()
 	mDoubleClickTeleport		= gSavedSettings.getBOOL("DoubleClickTeleport");
 	mHideNotificationsInChat	= gSavedSettings.getBOOL("HideNotificationsInChat");
 	mPlayTypingSound			= gSavedSettings.getBOOL("PlayTypingSound");
+	mDisablePointAtAndBeam			= gSavedSettings.getBOOL("DisablePointAtAndBeam");
 	mPrivateLookAt				= gSavedSettings.getBOOL("PrivateLookAt");
 	mSecondsInChatAndIMs		= gSavedSettings.getBOOL("SecondsInChatAndIMs");
 	mFetchInventoryOnLogin		= gSavedSettings.getBOOL("FetchInventoryOnLogin");
@@ -186,6 +188,7 @@ void LLPrefsInertImpl::cancel()
 	gSavedSettings.setBOOL("DoubleClickTeleport",		mDoubleClickTeleport);
 	gSavedSettings.setBOOL("HideNotificationsInChat",	mHideNotificationsInChat);
 	gSavedSettings.setBOOL("PlayTypingSound",			mPlayTypingSound);
+	gSavedSettings.setBOOL("DisablePointAtAndBeam",			mDisablePointAtAndBeam);
 	gSavedSettings.setBOOL("PrivateLookAt",				mPrivateLookAt);
 	gSavedSettings.setBOOL("FetchInventoryOnLogin",		mFetchInventoryOnLogin);
 	gSavedSettings.setBOOL("SecondsInChatAndIMs",		mSecondsInChatAndIMs);
diff --git a/indra/newview/skins/default/xui/en-us/panel_preferences_inert.xml b/indra/newview/skins/default/xui/en-us/panel_preferences_inert.xml
index 0443b07db..f329072e2 100644
--- a/indra/newview/skins/default/xui/en-us/panel_preferences_inert.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_preferences_inert.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel top="20" left="10" height="400" width="517" follows="left|top|right|bottom"
 	border="true" label="Inert Prefs" name="inert" enabled="true" mouse_opaque="true">
-	<tab_container label="Inertia" bottom="0" height="408" width="500" left="0"
+	<tab_container label="Inertia" bottom="0" height="440" width="500" left="0"
 		name="Inert Prefs" tab_min_width="90" tab_position="top">
 		<panel border="true" left="1" bottom="-408" height="408" width="500" mouse_opaque="true"
 			follows="left|top|right|bottom" label="User Interface" name="User Interface">
@@ -127,12 +127,17 @@
 			    width="400" />
 			<check_box bottom_delta="-20" control_name="BroadcastViewerEffects" enabled="true"
 			    follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-		    	label="Broadcast Viewer Effects" left="10"
+		    	label="Broadcast Viewer Effects (Does not include beams)" left="10"
 			    mouse_opaque="true" name="broadcast_viewer_effects" radio_style="false"
 		    	width="400" />
+			<check_box bottom_delta="-20" control_name="DisablePointAtAndBeam" enabled="true"
+			    follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
+		    	label="Disable Point At And Beam" left="10"
+			    mouse_opaque="true" name="disable_point_at_and_beams_check" radio_style="false"
+		    	width="400" />
 			<check_box bottom_delta="-20" control_name="PrivateLookAt" enabled="true"
 			    follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-	    		label="Do not look at or point to objects (defeats ShowLookAt)" left="10"
+	    		label="Do not look at to objects (defeats ShowLookAt)" left="10"
 			    mouse_opaque="true" name="private_look_at_check" radio_style="false"
 			    width="400" />
 			<check_box bottom_delta="-20" control_name="RevokePermsOnStandUp" enabled="true"