From a8fb423e44ede5777a15cc6f7cfbd614795f6cf9 Mon Sep 17 00:00:00 2001
From: TighMacFanatic <rdes321@gmail.com>
Date: Sun, 17 Jul 2011 17:04:33 -0400
Subject: [PATCH 1/2] Fix compile warning due to signed/unsigned mistake.

---
 indra/newview/lltexturefetch.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/lltexturefetch.cpp b/indra/newview/lltexturefetch.cpp
index 967d56b9d..ced122c78 100644
--- a/indra/newview/lltexturefetch.cpp
+++ b/indra/newview/lltexturefetch.cpp
@@ -479,7 +479,7 @@ static bool sgConnectionThrottle() {
 	LLMutexLock lock(&mutex);
 	const U32 THROTTLE_TIMESTEPS_PER_SECOND = 10;
 	static const LLCachedControl<U32> max_connections_per_second("HTTPRequestRate", 30);
-	S32 max_connections = max_connections_per_second/THROTTLE_TIMESTEPS_PER_SECOND;
+	U32 max_connections = max_connections_per_second/THROTTLE_TIMESTEPS_PER_SECOND;
 	const S32 timestep = USEC_PER_SEC/THROTTLE_TIMESTEPS_PER_SECOND;
 	U64 now = LLTimer::getTotalTime();
 	std::deque<U64> timestamps;

From f54ca35d1bb1b7f7fab7fb1d4a7c4b908e88c9f2 Mon Sep 17 00:00:00 2001
From: TighMacFanatic <rdes321@gmail.com>
Date: Tue, 2 Aug 2011 14:56:18 -0400
Subject: [PATCH 2/2] Fix label on disable TP and login screen options.

---
 .../default/xui/en-us/panel_preferences_ascent_vanity.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_vanity.xml b/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_vanity.xml
index 5db045198..a34e943bf 100644
--- a/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_vanity.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_vanity.xml
@@ -13,8 +13,8 @@
         width="400" />
       <check_box bottom_delta="-20" control_name="AscentDisableTeleportScreens" enabled="true"
         follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-        label="Show the Teleport progress screens" left="10"
-        tool_tip="If turned off, the viewer will not hide your UI while teleporting, allowing you to continue to read IMs."
+        label="Hide the Teleport progress screens" left="10"
+        tool_tip="If checked, the viewer will hide the teleport progress screen, allowing you to continue to read IMs."
         mouse_opaque="true" name="disable_tp_screen_check" radio_style="false"
         width="400" />
       <check_box bottom_delta="-20" control_name="OptionPlayTpSound" enabled="true"
@@ -25,8 +25,8 @@
         width="400" />
       <check_box bottom_delta="-20" control_name="AscentDisableLogoutScreens" enabled="true"
         follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-        label="Show the Login/Logout progress screens" left="10"
-        tool_tip="If turned off, the viewer does not hide the UI when logging in or out."
+        label="Hide the Login/Logout progress screens" left="10"
+        tool_tip="If checked, the viewer will hide the login/logout progress screen."
         mouse_opaque="true" name="disable_logout_screen_check" radio_style="false"
         width="400" />
     </panel>