From c0a79227d71fbfdd2bfa6402f92d35d0c23d7f92 Mon Sep 17 00:00:00 2001
From: Tank_Master <none@none>
Date: Tue, 29 May 2012 16:52:57 -0700
Subject: Add individual volume controls to pannel_volume_pulldown Also
 includes translations for some of the other languages

---
 doc/contributions.txt                              |   3 +-
 .../skins/default/xui/de/panel_volume_pulldown.xml |  15 +
 .../skins/default/xui/en/panel_volume_pulldown.xml | 310 +++++++++++++++++++--
 .../skins/default/xui/es/panel_volume_pulldown.xml |  14 +
 .../skins/default/xui/it/panel_volume_pulldown.xml |  15 +
 .../skins/default/xui/pl/panel_volume_pulldown.xml |  14 +
 6 files changed, 346 insertions(+), 25 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/de/panel_volume_pulldown.xml
 create mode 100644 indra/newview/skins/default/xui/es/panel_volume_pulldown.xml
 create mode 100644 indra/newview/skins/default/xui/it/panel_volume_pulldown.xml
 create mode 100644 indra/newview/skins/default/xui/pl/panel_volume_pulldown.xml

diff --git a/doc/contributions.txt b/doc/contributions.txt
index 04edfb4bea..df0aab4a89 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -1092,8 +1092,9 @@ Synystyr Texan
 Takeda Terrawyng
 TankMaster Finesmith
 	STORM-1100
-	STORM-1602
 	STORM-1258
+	STORM-1602
+	STORM-1868
     VWR-26622
 Talamasca
 Tali Rosca
diff --git a/indra/newview/skins/default/xui/de/panel_volume_pulldown.xml b/indra/newview/skins/default/xui/de/panel_volume_pulldown.xml
new file mode 100644
index 0000000000..e6ab9165d7
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_volume_pulldown.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="volumepulldown_floater" width="240">
+	<button left="217" name="prefs_btn"/>
+	<slider label="Master" name="System Volume" label_width="80" width="180"/>
+    <slider label="Schaltflächen" label_width="80" width="180" name="UI Volume"/>
+    <slider label="Umgebung" label_width="80" width="180" name="Wind Volume"/>
+    <slider label="Soundeffekte" label_width="80" width="180" name="SFX Volume"/>
+	<check_box name="gesture_audio_play_btn" tool_tip="Sounds von Gesten abspielen"/>
+    <slider label="Musikstream" label_width="80" width="180" name="Music Volume"/>
+	<check_box tool_tip="Musikstream aktivieren" name="enable_music"/>
+    <slider label="Medien" label_width="80" width="180" name="Media Volume"/>
+	<check_box tool_tip="Medienstream aktivieren" name="enable_media"/>
+    <slider label="Voice-Chat" label_width="80" width="180" name="Voice Volume"/>
+	<check_box tool_tip="Voice-Chat aktivieren" name="enable_voice_check"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml b/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml
index 7b22b2cce1..7e882c2b5e 100644
--- a/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml
+++ b/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml
@@ -8,31 +8,12 @@
  border="false"
  chrome="true"
  follows="bottom"
- height="150"
+ height="155"
  layout="topleft"
  name="volumepulldown_floater"
- width="32">
- <slider
-  control_name="AudioLevelMaster"
-  follows="left|top"
-  left="0"
-  top="1"
-  orientation="vertical"
-  height="120"
-  increment="0.05"
-  initial_value="0.5"
-  layout="topleft"
-  name="mastervolume"
-  show_text="false"
-  slider_label.halign="right"
-  top_pad="2"
-  volume="true">
-  <slider.commit_callback
-   function="Vol.setControlFalse"
-   parameter="MuteAudio" />
-  </slider>
-  <button
-    left="10"
+ width="210">
+   <button
+    left="187"
     top_pad="9"
     width="12"
     height="12"
@@ -44,5 +25,286 @@
     scale_image="false">
     <button.commit_callback
        function="Vol.GoAudioPrefs" />
-  </button>
+  </button> 
+      <slider
+     control_name="AudioLevelMaster"
+     follows="top|left"
+     font.style="BOLD"
+     height="15"
+     increment="0.025"
+     initial_value="0.5"
+     label="Master"
+     label_width="50"
+     left="10"
+     width="150"
+     layout="topleft"
+     name="System Volume"
+     show_text="false"
+     top="10"
+     volume="true">
+        <slider.commit_callback
+         function="Pref.setControlFalse"
+         parameter="MuteAudio" />
+    </slider>
+    <button
+     control_name="MuteAudio"
+     follows="top|left"
+     height="16"
+     image_selected="AudioMute_Off"
+     image_unselected="Audio_Off"
+     is_toggle="true"
+     layout="topleft"
+     left_pad="5"
+     name="mute_audio"
+     tab_stop="false"
+     width="16" />
+    <slider
+        control_name="AudioLevelUI"
+        disabled_control="MuteAudio"
+        follows="left|top"
+        height="15"
+        increment="0.025"
+        initial_value="0.5"
+        label="Buttons"
+        label_width="50"
+        left="10"
+        width="150"
+        layout="topleft"
+        name="UI Volume"
+        show_text="false"
+        top_pad="4"
+        volume="true">
+    <slider.commit_callback
+        function="Pref.setControlFalse"
+        parameter="MuteUI" />
+    </slider>
+    <button
+        control_name="MuteUI"
+        disabled_control="MuteAudio"
+        follows="top|left"
+        height="16"
+        image_selected="AudioMute_Off"
+        image_unselected="Audio_Off"
+        is_toggle="true"
+        layout="topleft"
+        left_pad="5"
+        name="mute_audio"
+        tab_stop="false"
+        width="16" />
+    <slider
+     control_name="AudioLevelAmbient"
+     disabled_control="MuteAudio"
+     follows="left|top"
+     height="15"
+     increment="0.025"
+     initial_value="0.5"
+     label="Ambient"
+     label_width="50"
+     left="10"
+     width="150"
+     layout="topleft"
+     name="Wind Volume"
+     show_text="false"
+     top_pad="4"
+     volume="true">
+        <slider.commit_callback
+         function="Pref.setControlFalse"
+         parameter="MuteAmbient" />
+    </slider>
+    <button
+     control_name="MuteAmbient"
+     disabled_control="MuteAudio"
+     follows="top|left"
+     height="16"
+     image_selected="AudioMute_Off"
+     image_unselected="Audio_Off"
+     is_toggle="true"
+     layout="topleft"
+     left_pad="5"
+     name="mute_audio"
+     tab_stop="false"
+     width="16" />
+    <slider
+     control_name="AudioLevelSFX"
+     disabled_control="MuteAudio"
+     follows="left|top"
+     height="15"
+     increment="0.025"
+     initial_value="0.5"
+     label="Sounds"
+     label_width="50"
+     left="10"
+     width="150"
+     layout="topleft"
+     name="SFX Volume"
+     show_text="false"
+     top_pad="4"
+     volume="true">
+        <slider.commit_callback
+         function="Pref.setControlFalse"
+         parameter="MuteSounds" />
+    </slider>
+    <button
+     control_name="MuteSounds"
+     disabled_control="MuteAudio"
+     follows="top|left"
+     height="16"
+     image_selected="AudioMute_Off"
+     image_unselected="Audio_Off"
+     is_toggle="true"
+     layout="topleft"
+     left_pad="5"
+     name="mute_audio"
+     tab_stop="false"
+     width="16">
+      <button.commit_callback
+      function="Pref.SetSounds"/>
+    </button>
+  <check_box
+    name="gesture_audio_play_btn"
+		control_name="EnableGestureSounds"
+    disabled_control="MuteAudio"
+    height="16"
+    layout="topleft"
+    left_pad="5"
+    tool_tip="Enable sounds from gestures"
+    top_delta="2"
+    width="350"/>
+    <slider
+     control_name="AudioLevelMusic"
+     disabled_control="MuteAudio"
+     follows="left|top"
+     height="15"
+     increment="0.025"
+     initial_value="0.5"
+     label="Music"
+     label_width="50"
+     left="10"
+     width="150"
+     layout="topleft"
+     name="Music Volume"
+     show_text="false"
+     top_pad="4"
+     volume="true">
+        <slider.commit_callback
+         function="Pref.setControlFalse"
+         parameter="MuteMusic" />
+    </slider>
+    <button
+     control_name="MuteMusic"
+     disabled_control="MuteAudio"
+     follows="top|left"
+     height="16"
+     image_selected="AudioMute_Off"
+     image_unselected="Audio_Off"
+     is_toggle="true"
+     layout="topleft"
+     left_pad="5"
+     name="mute_audio"
+     tab_stop="false"
+     width="16" />
+    <check_box
+        control_name="AudioStreamingMusic"
+        height="16"
+        tool_tip="Enable Streaming Music"
+        layout="topleft"
+        left_pad="5"
+        name="enable_music"
+        top_delta="2"
+        width="350">
+        <check_box.commit_callback
+            function="Pref.updateMediaAutoPlayCheckbox"/>
+    </check_box>
+    <slider
+        control_name="AudioLevelMedia"
+        disabled_control="MuteAudio"
+        follows="left|top"
+        height="16"
+        increment="0.025"
+        initial_value="0.5"
+        label="Media"
+        label_width="50"
+        left="10"
+        width="150"
+        layout="topleft"
+        name="Media Volume"
+        show_text="false"
+        top_pad="4"
+        volume="true">
+      <slider.commit_callback
+        function="Pref.setControlFalse"
+        parameter="MuteMedia" />
+    </slider>
+    <button
+        control_name="MuteMedia"
+        disabled_control="MuteAudio"
+        follows="top|left"
+        height="16"
+        image_selected="AudioMute_Off"
+        image_unselected="Audio_Off"
+        is_toggle="true"
+        layout="topleft"
+        left_pad="5"
+        name="mute_audio"
+        tab_stop="false"
+        width="16" />
+    <check_box
+        label_text.halign="left"
+        follows="left|top"
+        height="16"
+        control_name ="AudioStreamingMedia"
+        tool_tip="Enable Streaming Media"
+        layout="topleft"
+        top_delta="2"
+        left_pad="5"
+        name="enable_media"
+        width="110">
+        <check_box.commit_callback
+            function="Pref.updateMediaAutoPlayCheckbox"/>
+    </check_box>
+    <slider
+        control_name="AudioLevelVoice"
+        disabled_control="MuteAudio"
+        follows="left|top"
+        height="16"
+        increment="0.025"
+        initial_value="0.5"
+        label="Voice"
+        label_width="50"
+        left="10"
+        width="150"
+        layout="topleft"
+        top_pad="4"
+        name="Voice Volume"
+        show_text="false"
+        volume="true">
+    <slider.commit_callback
+        function="Pref.setControlFalse"
+        parameter="MuteVoice" />
+    </slider>
+    <button
+        control_name="MuteVoice"
+        disabled_control="MuteAudio"
+        follows="top|left"
+        height="16"
+        image_selected="AudioMute_Off"
+        image_unselected="Audio_Off"
+        is_toggle="true"
+        layout="topleft"
+        left_pad="5"
+        name="mute_audio"
+        tab_stop="false"
+        width="16" />
+    <check_box
+        label_text.halign="left"
+        follows="left|top"
+        height="16"
+        control_name ="EnableVoiceChat"
+        disabled_control="CmdLineDisableVoice"
+        tool_tip="Enable Voice Chat"
+        layout="topleft"
+        top_delta="2"
+        left_pad="5"
+        name="enable_voice_check"
+        width="110"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_volume_pulldown.xml b/indra/newview/skins/default/xui/es/panel_volume_pulldown.xml
new file mode 100644
index 0000000000..9193da6cde
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_volume_pulldown.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="volumepulldown_floater" width="215">
+	<slider label="Maestro" name="System Volume" label_width="55" width="155"/>
+	<slider label="Botones" name="UI Volume" label_width="55" width="155"/>
+	<slider label="Ambiente" name="Wind Volume" label_width="55" width="155"/>
+	<slider label="Sonidos" name="SFX Volume" label_width="55" width="155"/>
+	<check_box name="gesture_audio_play_btn" tool_tip="Activa el sonido de los gestos"/>
+	<slider label="Música" name="Music Volume" label_width="55" width="155"/>
+	<check_box tool_tip="Activa el flujo de audio" name="enable_music"/>
+	<slider label="Medios" name="Media Volume" label_width="55" width="155"/>
+	<check_box tool_tip="Activa el flujo de medios" name="enable_media"/>
+	<slider label="Voz" name="Voice Volume" label_width="55" width="155"/>
+	<check_box tool_tip="Activar chat de voz" name="enable_voice_check"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_volume_pulldown.xml b/indra/newview/skins/default/xui/it/panel_volume_pulldown.xml
new file mode 100644
index 0000000000..1792b09413
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/panel_volume_pulldown.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="volumepulldown_floater" width="220">
+    <button left="197" name="prefs_btn"/>
+    <slider label="Generale" name="System Volume" label_width="60" width="160"/>
+    <slider label="Interfaccia" name="UI Volume" label_width="60" width="160"/>
+    <slider label="Ambiente" name="Wind Volume" label_width="60" width="160"/>
+    <slider label="Suoni" name="SFX Volume" label_width="60" width="160"/>
+    <check_box name="gesture_audio_play_btn" tool_tip="Attiva suoni Gesture"/>
+    <slider label="Musica" name="Music Volume" label_width="60" width="160"/>
+    <check_box tool_tip="Abilita musica in streaming" name="enable_music"/>
+    <slider label="Media" name="Media Volume" label_width="60" width="160"/>
+    <check_box tool_tip="Abilita riproduzione media" name="enable_media"/>
+    <slider label="Voice" name="Voice Volume" label_width="60" width="160"/>
+    <check_box tool_tip="Abilita il voice" name="enable_voice_check"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_volume_pulldown.xml b/indra/newview/skins/default/xui/pl/panel_volume_pulldown.xml
new file mode 100644
index 0000000000..1611900700
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/panel_volume_pulldown.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="volumepulldown_floater">
+    <slider label="Główny" name="System Volume"/>
+    <slider label="Przyciski" name="UI Volume"/>
+    <slider label="Okolica" name="Wind Volume"/>
+    <slider label="Efekty" name="SFX Volume"/>
+    <check_box name="gesture_audio_play_btn" tool_tip="Włącz dźwięki gestów"/>
+    <slider label="Muzyka" name="Music Volume"/>
+    <check_box tool_tip="Włącz muzykę strumieniową" name="enable_music"/>
+    <slider label="Media" name="Media Volume"/>
+    <check_box tool_tip="Włącz media strumieniowe" name="enable_media"/>
+    <slider label="Głos" name="Voice Volume"/>
+    <check_box tool_tip="Włącz rozmowy głosowe" name="enable_voice_check"/>
+</panel>
-- 
cgit v1.2.3


From e78632f5b1023db0f0f8ad58ee8b076eed1e5dbd Mon Sep 17 00:00:00 2001
From: Tank_Master <none@none>
Date: Tue, 29 May 2012 19:19:22 -0700
Subject: move floater over so it is not partly off screen

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

diff --git a/indra/newview/llstatusbar.cpp b/indra/newview/llstatusbar.cpp
index 89240c982f..ff69c6e9fd 100644
--- a/indra/newview/llstatusbar.cpp
+++ b/indra/newview/llstatusbar.cpp
@@ -469,7 +469,7 @@ void LLStatusBar::onMouseEnterVolume()
 	LLRect vol_btn_rect = volbtn->getRect();
 	LLRect volume_pulldown_rect = mPanelVolumePulldown->getRect();
 	volume_pulldown_rect.setLeftTopAndSize(vol_btn_rect.mLeft -
-	     (volume_pulldown_rect.getWidth() - vol_btn_rect.getWidth())/2,
+	     (volume_pulldown_rect.getWidth() - vol_btn_rect.getWidth()),
 			       vol_btn_rect.mBottom,
 			       volume_pulldown_rect.getWidth(),
 			       volume_pulldown_rect.getHeight());
-- 
cgit v1.2.3


From da6c5fbf7ff589b73f8cb834925206b6464ef632 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Wed, 6 Jun 2012 19:05:51 -0400
Subject: MAINT-1144: Unblock build for previous commit. Today, 2012-06-06,
 LLHTTPClient::get("http://www.google.com/") has stopped working. This is
 unrelated to viewer code changes: it crosses repo boundaries. Skip the
 afflicted tests to get builds working until we can recast the tests to avoid
 the flaky dependency.

---
 indra/test/llhttpclient_tut.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/indra/test/llhttpclient_tut.cpp b/indra/test/llhttpclient_tut.cpp
index 4b4046632c..1e0296918c 100644
--- a/indra/test/llhttpclient_tut.cpp
+++ b/indra/test/llhttpclient_tut.cpp
@@ -257,6 +257,7 @@ namespace tut
 	template<> template<>
 	void HTTPClientTestObject::test<1>()
 	{
+		skip("google.com unit tests stopped working 2012-06-06");
 		LLHTTPClient::get("http://www.google.com/", newResult());
 		runThePump();
 		ensureStatusOK();
@@ -362,6 +363,7 @@ namespace tut
 	template<> template<>
 		void HTTPClientTestObject::test<8>()
 	{
+		skip("google.com unit tests stopped working 2012-06-06");
 		// This is testing for the presence of the Header in the returned results
 		// from an HTTP::get call.
 		LLHTTPClient::get("http://www.google.com/", newResult());
@@ -373,6 +375,7 @@ namespace tut
 	template<> template<>
 	void HTTPClientTestObject::test<9>()
 	{
+		skip("google.com unit tests stopped working 2012-06-06");
 		LLHTTPClient::head("http://www.google.com/", newResult());
 		runThePump();
 		ensureStatusOK();
-- 
cgit v1.2.3


From cd05a244da8d3249db1f3c1e8db215eb28da2816 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Wed, 6 Jun 2012 19:57:58 -0400
Subject: MAINT-1144: Break out llhttpclient_tut as standalone integration
 test. indra/test/llhttpclient_tut.cpp ==>
 indra/llmessage/tests/llhttpclient_test.cpp, with corresponding
 CMakeLists.txt changes in their respective directories. This first commit
 merely moves the test source file without changing it -- separating out moves
 from edits simplifies code review.

---
 indra/llmessage/CMakeLists.txt              |   8 +
 indra/llmessage/tests/llhttpclient_test.cpp | 386 ++++++++++++++++++++++++++++
 indra/test/CMakeLists.txt                   |   1 -
 indra/test/llhttpclient_tut.cpp             | 386 ----------------------------
 4 files changed, 394 insertions(+), 387 deletions(-)
 create mode 100644 indra/llmessage/tests/llhttpclient_test.cpp
 delete mode 100644 indra/test/llhttpclient_tut.cpp

diff --git a/indra/llmessage/CMakeLists.txt b/indra/llmessage/CMakeLists.txt
index 0f40a670fa..d98781e9e6 100644
--- a/indra/llmessage/CMakeLists.txt
+++ b/indra/llmessage/CMakeLists.txt
@@ -254,6 +254,14 @@ if (LL_TESTS)
     "${CMAKE_CURRENT_SOURCE_DIR}/tests/test_llsdmessage_peer.py"
     )
 
+  LL_ADD_INTEGRATION_TEST(
+    llhttpclient
+    "llhttpclient.cpp"
+    "${test_libs}"
+    ${PYTHON_EXECUTABLE}
+    "${CMAKE_CURRENT_SOURCE_DIR}/tests/test_llsdmessage_peer.py"
+    )
+
   LL_ADD_INTEGRATION_TEST(llavatarnamecache "" "${test_libs}")
   LL_ADD_INTEGRATION_TEST(llhost "" "${test_libs}")
   LL_ADD_INTEGRATION_TEST(llpartdata "" "${test_libs}")
diff --git a/indra/llmessage/tests/llhttpclient_test.cpp b/indra/llmessage/tests/llhttpclient_test.cpp
new file mode 100644
index 0000000000..1e0296918c
--- /dev/null
+++ b/indra/llmessage/tests/llhttpclient_test.cpp
@@ -0,0 +1,386 @@
+/** 
+ * @file llhttpclient_tut.cpp
+ * @brief Testing the HTTP client classes.
+ *
+ * $LicenseInfo:firstyear=2006&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2010, Linden Research, Inc.
+ * 
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * 
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+ * $/LicenseInfo$
+ */
+
+/**
+ *
+ * These classes test the HTTP client framework.
+ *
+ */
+
+#include <tut/tut.hpp>
+#include "linden_common.h"
+
+// These are too slow on Windows to actually include in the build. JC
+#if !LL_WINDOWS
+
+#include "lltut.h"
+#include "llhttpclient.h"
+#include "llformat.h"
+#include "llpipeutil.h"
+#include "llproxy.h"
+#include "llpumpio.h"
+
+#include "llsdhttpserver.h"
+#include "lliohttpserver.h"
+#include "lliosocket.h"
+
+namespace tut
+{
+	LLSD storage;
+	
+	class LLSDStorageNode : public LLHTTPNode
+	{
+	public:
+		LLSD simpleGet() const					{ return storage; }
+		LLSD simplePut(const LLSD& value) const	{ storage = value; return LLSD(); }
+	};
+
+	class ErrorNode : public LLHTTPNode
+	{
+	public:
+		void get(ResponsePtr r, const LLSD& context) const
+			{ r->status(599, "Intentional error"); }
+		void post(ResponsePtr r, const LLSD& context, const LLSD& input) const
+			{ r->status(input["status"], input["reason"]); }
+	};
+
+	class TimeOutNode : public LLHTTPNode
+	{
+	public:
+		void get(ResponsePtr r, const LLSD& context) const
+		{
+            /* do nothing, the request will eventually time out */ 
+		}
+	};
+
+	LLHTTPRegistration<LLSDStorageNode> gStorageNode("/test/storage");
+	LLHTTPRegistration<ErrorNode>		gErrorNode("/test/error");
+	LLHTTPRegistration<TimeOutNode>		gTimeOutNode("/test/timeout");
+
+	struct HTTPClientTestData
+	{
+	public:
+		HTTPClientTestData()
+		{
+			apr_pool_create(&mPool, NULL);
+			LLCurl::initClass(false);
+			mServerPump = new LLPumpIO(mPool);
+			mClientPump = new LLPumpIO(mPool);
+
+			LLHTTPClient::setPump(*mClientPump);
+		}
+		
+		~HTTPClientTestData()
+		{
+			delete mServerPump;
+			delete mClientPump;
+			LLProxy::cleanupClass();
+			apr_pool_destroy(mPool);
+		}
+
+		void setupTheServer()
+		{
+			LLHTTPNode& root = LLIOHTTPServer::create(mPool, *mServerPump, 8888);
+
+			LLHTTPStandardServices::useServices();
+			LLHTTPRegistrar::buildAllServices(root);
+		}
+		
+		void runThePump(float timeout = 100.0f)
+		{
+			LLTimer timer;
+			timer.setTimerExpirySec(timeout);
+
+			while(!mSawCompleted && !mSawCompletedHeader && !timer.hasExpired())
+			{
+				if (mServerPump)
+				{
+					mServerPump->pump();
+					mServerPump->callback();
+				}
+				if (mClientPump)
+				{
+					mClientPump->pump();
+					mClientPump->callback();
+				}
+			}
+		}
+
+		void killServer()
+		{
+			delete mServerPump;
+			mServerPump = NULL;
+		}
+	
+	private:
+		apr_pool_t* mPool;
+		LLPumpIO* mServerPump;
+		LLPumpIO* mClientPump;
+
+		
+	protected:
+		void ensureStatusOK()
+		{
+			if (mSawError)
+			{
+				std::string msg =
+					llformat("error() called when not expected, status %d",
+						mStatus); 
+				fail(msg);
+			}
+		}
+	
+		void ensureStatusError()
+		{
+			if (!mSawError)
+			{
+				fail("error() wasn't called");
+			}
+		}
+		
+		LLSD getResult()
+		{
+			return mResult;
+		}
+		LLSD getHeader()
+		{
+			return mHeader;
+		}
+	
+	protected:
+		bool mSawError;
+		U32 mStatus;
+		std::string mReason;
+		bool mSawCompleted;
+		bool mSawCompletedHeader;
+		LLSD mResult;
+		LLSD mHeader;
+		bool mResultDeleted;
+
+		class Result : public LLHTTPClient::Responder
+		{
+		protected:
+			Result(HTTPClientTestData& client)
+				: mClient(client)
+			{
+			}
+		
+		public:
+			static boost::intrusive_ptr<Result> build(HTTPClientTestData& client)
+			{
+				return boost::intrusive_ptr<Result>(new Result(client));
+			}
+			
+			~Result()
+			{
+				mClient.mResultDeleted = true;
+			}
+			
+			virtual void error(U32 status, const std::string& reason)
+			{
+				mClient.mSawError = true;
+				mClient.mStatus = status;
+				mClient.mReason = reason;
+			}
+
+			virtual void result(const LLSD& content)
+			{
+				mClient.mResult = content;
+			}
+
+			virtual void completed(
+							U32 status, const std::string& reason,
+							const LLSD& content)
+			{
+				LLHTTPClient::Responder::completed(status, reason, content);
+				
+				mClient.mSawCompleted = true;
+			}
+
+			virtual void completedHeader(
+				U32 status, const std::string& reason,
+				const LLSD& content)
+			{
+				mClient.mHeader = content;
+				mClient.mSawCompletedHeader = true;
+			}
+
+		private:
+			HTTPClientTestData& mClient;
+		};
+
+		friend class Result;
+
+	protected:
+		LLHTTPClient::ResponderPtr newResult()
+		{
+			mSawError = false;
+			mStatus = 0;
+			mSawCompleted = false;
+			mSawCompletedHeader = false;
+			mResult.clear();
+			mHeader.clear();
+			mResultDeleted = false;
+			
+			return Result::build(*this);
+		}
+	};
+	
+	
+	typedef test_group<HTTPClientTestData>	HTTPClientTestGroup;
+	typedef HTTPClientTestGroup::object		HTTPClientTestObject;
+	HTTPClientTestGroup httpClientTestGroup("http_client");
+
+	template<> template<>
+	void HTTPClientTestObject::test<1>()
+	{
+		skip("google.com unit tests stopped working 2012-06-06");
+		LLHTTPClient::get("http://www.google.com/", newResult());
+		runThePump();
+		ensureStatusOK();
+		ensure("result object wasn't destroyed", mResultDeleted);
+	}
+
+	template<> template<>
+	void HTTPClientTestObject::test<2>()
+	{
+		skip("error test depends on dev's local ISP not supplying \"helpful\" search page");
+		LLHTTPClient::get("http://www.invalid", newResult());
+		runThePump();
+		ensureStatusError();
+	}
+
+	template<> template<>
+		void HTTPClientTestObject::test<3>()
+	{
+		LLSD sd;
+
+		sd["list"][0]["one"] = 1;
+		sd["list"][0]["two"] = 2;
+		sd["list"][1]["three"] = 3;
+		sd["list"][1]["four"] = 4;
+		
+		setupTheServer();
+
+		LLHTTPClient::post("http://localhost:8888/web/echo", sd, newResult());
+		runThePump();
+		ensureStatusOK();
+		ensure_equals("echoed result matches", getResult(), sd);
+	}
+
+	template<> template<>
+		void HTTPClientTestObject::test<4>()
+	{
+		LLSD sd;
+
+		sd["message"] = "This is my test message.";
+
+		setupTheServer();
+		LLHTTPClient::put("http://localhost:8888/test/storage", sd, newResult());
+		runThePump();
+		ensureStatusOK();
+
+		LLHTTPClient::get("http://localhost:8888/test/storage", newResult());
+		runThePump();
+		ensureStatusOK();
+		ensure_equals("echoed result matches", getResult(), sd);
+	
+	}
+
+	template<> template<>
+		void HTTPClientTestObject::test<5>()
+	{
+		LLSD sd;
+		sd["status"] = 543;
+		sd["reason"] = "error for testing";
+
+		setupTheServer();
+
+		LLHTTPClient::post("http://localhost:8888/test/error", sd, newResult());
+		runThePump();
+		ensureStatusError();
+		ensure_contains("reason", mReason, sd["reason"]);
+	}
+
+	template<> template<>
+		void HTTPClientTestObject::test<6>()
+	{
+		setupTheServer();
+
+		LLHTTPClient::get("http://localhost:8888/test/timeout", newResult());
+		runThePump(1.0f);
+		killServer();
+		runThePump();
+		ensureStatusError();
+		ensure_equals("reason", mReason, "STATUS_ERROR");
+	}
+
+	template<> template<>
+		void HTTPClientTestObject::test<7>()
+	{
+		// Can not use the little mini server.  The blocking request
+		// won't ever let it run.  Instead get from a known LLSD
+		// source and compare results with the non-blocking get which
+		// is tested against the mini server earlier.
+		skip("secondlife.com is not reliable enough for unit tests.");
+
+
+		LLSD expected;
+
+		LLHTTPClient::get("http://secondlife.com/xmlhttp/homepage.php", newResult());
+		runThePump();
+		ensureStatusOK();
+		expected = getResult();
+
+		LLSD result;
+		result = LLHTTPClient::blockingGet("http://secondlife.com/xmlhttp/homepage.php");
+		LLSD body = result["body"];
+		ensure_equals("echoed result matches", body.size(), expected.size());
+	}
+	template<> template<>
+		void HTTPClientTestObject::test<8>()
+	{
+		skip("google.com unit tests stopped working 2012-06-06");
+		// This is testing for the presence of the Header in the returned results
+		// from an HTTP::get call.
+		LLHTTPClient::get("http://www.google.com/", newResult());
+		runThePump();
+		ensureStatusOK();
+		LLSD header = getHeader();
+		ensure_equals("got a header", header.emptyMap().asBoolean(), FALSE);
+	}
+	template<> template<>
+	void HTTPClientTestObject::test<9>()
+	{
+		skip("google.com unit tests stopped working 2012-06-06");
+		LLHTTPClient::head("http://www.google.com/", newResult());
+		runThePump();
+		ensureStatusOK();
+		ensure("result object wasn't destroyed", mResultDeleted);
+	}
+}
+
+#endif	// !LL_WINDOWS
diff --git a/indra/test/CMakeLists.txt b/indra/test/CMakeLists.txt
index 328ab4ca51..816f1d7175 100644
--- a/indra/test/CMakeLists.txt
+++ b/indra/test/CMakeLists.txt
@@ -37,7 +37,6 @@ set(test_SOURCE_FILES
     lldoubledispatch_tut.cpp
     llevents_tut.cpp
     llhttpdate_tut.cpp
-    llhttpclient_tut.cpp
     llhttpnode_tut.cpp
     lliohttpserver_tut.cpp
     llmessageconfig_tut.cpp
diff --git a/indra/test/llhttpclient_tut.cpp b/indra/test/llhttpclient_tut.cpp
deleted file mode 100644
index 1e0296918c..0000000000
--- a/indra/test/llhttpclient_tut.cpp
+++ /dev/null
@@ -1,386 +0,0 @@
-/** 
- * @file llhttpclient_tut.cpp
- * @brief Testing the HTTP client classes.
- *
- * $LicenseInfo:firstyear=2006&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
- * $/LicenseInfo$
- */
-
-/**
- *
- * These classes test the HTTP client framework.
- *
- */
-
-#include <tut/tut.hpp>
-#include "linden_common.h"
-
-// These are too slow on Windows to actually include in the build. JC
-#if !LL_WINDOWS
-
-#include "lltut.h"
-#include "llhttpclient.h"
-#include "llformat.h"
-#include "llpipeutil.h"
-#include "llproxy.h"
-#include "llpumpio.h"
-
-#include "llsdhttpserver.h"
-#include "lliohttpserver.h"
-#include "lliosocket.h"
-
-namespace tut
-{
-	LLSD storage;
-	
-	class LLSDStorageNode : public LLHTTPNode
-	{
-	public:
-		LLSD simpleGet() const					{ return storage; }
-		LLSD simplePut(const LLSD& value) const	{ storage = value; return LLSD(); }
-	};
-
-	class ErrorNode : public LLHTTPNode
-	{
-	public:
-		void get(ResponsePtr r, const LLSD& context) const
-			{ r->status(599, "Intentional error"); }
-		void post(ResponsePtr r, const LLSD& context, const LLSD& input) const
-			{ r->status(input["status"], input["reason"]); }
-	};
-
-	class TimeOutNode : public LLHTTPNode
-	{
-	public:
-		void get(ResponsePtr r, const LLSD& context) const
-		{
-            /* do nothing, the request will eventually time out */ 
-		}
-	};
-
-	LLHTTPRegistration<LLSDStorageNode> gStorageNode("/test/storage");
-	LLHTTPRegistration<ErrorNode>		gErrorNode("/test/error");
-	LLHTTPRegistration<TimeOutNode>		gTimeOutNode("/test/timeout");
-
-	struct HTTPClientTestData
-	{
-	public:
-		HTTPClientTestData()
-		{
-			apr_pool_create(&mPool, NULL);
-			LLCurl::initClass(false);
-			mServerPump = new LLPumpIO(mPool);
-			mClientPump = new LLPumpIO(mPool);
-
-			LLHTTPClient::setPump(*mClientPump);
-		}
-		
-		~HTTPClientTestData()
-		{
-			delete mServerPump;
-			delete mClientPump;
-			LLProxy::cleanupClass();
-			apr_pool_destroy(mPool);
-		}
-
-		void setupTheServer()
-		{
-			LLHTTPNode& root = LLIOHTTPServer::create(mPool, *mServerPump, 8888);
-
-			LLHTTPStandardServices::useServices();
-			LLHTTPRegistrar::buildAllServices(root);
-		}
-		
-		void runThePump(float timeout = 100.0f)
-		{
-			LLTimer timer;
-			timer.setTimerExpirySec(timeout);
-
-			while(!mSawCompleted && !mSawCompletedHeader && !timer.hasExpired())
-			{
-				if (mServerPump)
-				{
-					mServerPump->pump();
-					mServerPump->callback();
-				}
-				if (mClientPump)
-				{
-					mClientPump->pump();
-					mClientPump->callback();
-				}
-			}
-		}
-
-		void killServer()
-		{
-			delete mServerPump;
-			mServerPump = NULL;
-		}
-	
-	private:
-		apr_pool_t* mPool;
-		LLPumpIO* mServerPump;
-		LLPumpIO* mClientPump;
-
-		
-	protected:
-		void ensureStatusOK()
-		{
-			if (mSawError)
-			{
-				std::string msg =
-					llformat("error() called when not expected, status %d",
-						mStatus); 
-				fail(msg);
-			}
-		}
-	
-		void ensureStatusError()
-		{
-			if (!mSawError)
-			{
-				fail("error() wasn't called");
-			}
-		}
-		
-		LLSD getResult()
-		{
-			return mResult;
-		}
-		LLSD getHeader()
-		{
-			return mHeader;
-		}
-	
-	protected:
-		bool mSawError;
-		U32 mStatus;
-		std::string mReason;
-		bool mSawCompleted;
-		bool mSawCompletedHeader;
-		LLSD mResult;
-		LLSD mHeader;
-		bool mResultDeleted;
-
-		class Result : public LLHTTPClient::Responder
-		{
-		protected:
-			Result(HTTPClientTestData& client)
-				: mClient(client)
-			{
-			}
-		
-		public:
-			static boost::intrusive_ptr<Result> build(HTTPClientTestData& client)
-			{
-				return boost::intrusive_ptr<Result>(new Result(client));
-			}
-			
-			~Result()
-			{
-				mClient.mResultDeleted = true;
-			}
-			
-			virtual void error(U32 status, const std::string& reason)
-			{
-				mClient.mSawError = true;
-				mClient.mStatus = status;
-				mClient.mReason = reason;
-			}
-
-			virtual void result(const LLSD& content)
-			{
-				mClient.mResult = content;
-			}
-
-			virtual void completed(
-							U32 status, const std::string& reason,
-							const LLSD& content)
-			{
-				LLHTTPClient::Responder::completed(status, reason, content);
-				
-				mClient.mSawCompleted = true;
-			}
-
-			virtual void completedHeader(
-				U32 status, const std::string& reason,
-				const LLSD& content)
-			{
-				mClient.mHeader = content;
-				mClient.mSawCompletedHeader = true;
-			}
-
-		private:
-			HTTPClientTestData& mClient;
-		};
-
-		friend class Result;
-
-	protected:
-		LLHTTPClient::ResponderPtr newResult()
-		{
-			mSawError = false;
-			mStatus = 0;
-			mSawCompleted = false;
-			mSawCompletedHeader = false;
-			mResult.clear();
-			mHeader.clear();
-			mResultDeleted = false;
-			
-			return Result::build(*this);
-		}
-	};
-	
-	
-	typedef test_group<HTTPClientTestData>	HTTPClientTestGroup;
-	typedef HTTPClientTestGroup::object		HTTPClientTestObject;
-	HTTPClientTestGroup httpClientTestGroup("http_client");
-
-	template<> template<>
-	void HTTPClientTestObject::test<1>()
-	{
-		skip("google.com unit tests stopped working 2012-06-06");
-		LLHTTPClient::get("http://www.google.com/", newResult());
-		runThePump();
-		ensureStatusOK();
-		ensure("result object wasn't destroyed", mResultDeleted);
-	}
-
-	template<> template<>
-	void HTTPClientTestObject::test<2>()
-	{
-		skip("error test depends on dev's local ISP not supplying \"helpful\" search page");
-		LLHTTPClient::get("http://www.invalid", newResult());
-		runThePump();
-		ensureStatusError();
-	}
-
-	template<> template<>
-		void HTTPClientTestObject::test<3>()
-	{
-		LLSD sd;
-
-		sd["list"][0]["one"] = 1;
-		sd["list"][0]["two"] = 2;
-		sd["list"][1]["three"] = 3;
-		sd["list"][1]["four"] = 4;
-		
-		setupTheServer();
-
-		LLHTTPClient::post("http://localhost:8888/web/echo", sd, newResult());
-		runThePump();
-		ensureStatusOK();
-		ensure_equals("echoed result matches", getResult(), sd);
-	}
-
-	template<> template<>
-		void HTTPClientTestObject::test<4>()
-	{
-		LLSD sd;
-
-		sd["message"] = "This is my test message.";
-
-		setupTheServer();
-		LLHTTPClient::put("http://localhost:8888/test/storage", sd, newResult());
-		runThePump();
-		ensureStatusOK();
-
-		LLHTTPClient::get("http://localhost:8888/test/storage", newResult());
-		runThePump();
-		ensureStatusOK();
-		ensure_equals("echoed result matches", getResult(), sd);
-	
-	}
-
-	template<> template<>
-		void HTTPClientTestObject::test<5>()
-	{
-		LLSD sd;
-		sd["status"] = 543;
-		sd["reason"] = "error for testing";
-
-		setupTheServer();
-
-		LLHTTPClient::post("http://localhost:8888/test/error", sd, newResult());
-		runThePump();
-		ensureStatusError();
-		ensure_contains("reason", mReason, sd["reason"]);
-	}
-
-	template<> template<>
-		void HTTPClientTestObject::test<6>()
-	{
-		setupTheServer();
-
-		LLHTTPClient::get("http://localhost:8888/test/timeout", newResult());
-		runThePump(1.0f);
-		killServer();
-		runThePump();
-		ensureStatusError();
-		ensure_equals("reason", mReason, "STATUS_ERROR");
-	}
-
-	template<> template<>
-		void HTTPClientTestObject::test<7>()
-	{
-		// Can not use the little mini server.  The blocking request
-		// won't ever let it run.  Instead get from a known LLSD
-		// source and compare results with the non-blocking get which
-		// is tested against the mini server earlier.
-		skip("secondlife.com is not reliable enough for unit tests.");
-
-
-		LLSD expected;
-
-		LLHTTPClient::get("http://secondlife.com/xmlhttp/homepage.php", newResult());
-		runThePump();
-		ensureStatusOK();
-		expected = getResult();
-
-		LLSD result;
-		result = LLHTTPClient::blockingGet("http://secondlife.com/xmlhttp/homepage.php");
-		LLSD body = result["body"];
-		ensure_equals("echoed result matches", body.size(), expected.size());
-	}
-	template<> template<>
-		void HTTPClientTestObject::test<8>()
-	{
-		skip("google.com unit tests stopped working 2012-06-06");
-		// This is testing for the presence of the Header in the returned results
-		// from an HTTP::get call.
-		LLHTTPClient::get("http://www.google.com/", newResult());
-		runThePump();
-		ensureStatusOK();
-		LLSD header = getHeader();
-		ensure_equals("got a header", header.emptyMap().asBoolean(), FALSE);
-	}
-	template<> template<>
-	void HTTPClientTestObject::test<9>()
-	{
-		skip("google.com unit tests stopped working 2012-06-06");
-		LLHTTPClient::head("http://www.google.com/", newResult());
-		runThePump();
-		ensureStatusOK();
-		ensure("result object wasn't destroyed", mResultDeleted);
-	}
-}
-
-#endif	// !LL_WINDOWS
-- 
cgit v1.2.3


From 3d1cb7ef111cbd5724262077702e0dc2a3d6998d Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Wed, 6 Jun 2012 23:12:11 -0400
Subject: MAINT-1144: Re-enable skipped LLHTTPClient tests with local server.
 Over the years we've skipped more and more of the tests in
 llhttpclient_test.cpp (nee llhttpclient_tut.cpp) because they've relied on
 particular behaviors from Internet sites not under our control. We skipped a
 test that fetches llsd+xml from secondlife.com because "secondlife.com is not
 reliable enough for unit tests." We skipped a test that tries to observe a
 failure with "http://www.invalid" because some local ISPs turn "no such
 domain" DNS errors into valid pages offering the requester to buy the
 specified domain name. Today we've had to skip tests attempting to contact
 "http://www.google.com" for reasons we haven't yet diagnosed, but that
 probably have to do with Google's IPv6 rollout. Use local temp server
 test_llsdmessage_peer.py as the success destination, eliminating DNS,
 Internet access and remote server behavior as failure modes. Use idle
 localhost port for failure test. Re-enable all skipped LLHTTPClient tests!
 Re-enable on Windows! In support of these tests, modify
 test_llsdmessage_peer.py: Support HEAD as no-data variant of GET. Change GET
 result dict to avoid resembling an error response -- confusing. Make GET/POST
 return actual dict rather than undecorated string "success". Because of that
 last, change llcapabilitylistener_test.cpp and llsdmessage_test.cpp to
 extract "reply" key from response rather than expecting response to be a
 string itself.

---
 indra/llmessage/tests/llhttpclient_test.cpp       | 40 +++++++++--------------
 indra/llmessage/tests/llsdmessage_test.cpp        |  2 +-
 indra/llmessage/tests/test_llsdmessage_peer.py    | 19 +++++++----
 indra/newview/tests/llcapabilitylistener_test.cpp |  2 +-
 4 files changed, 30 insertions(+), 33 deletions(-)

diff --git a/indra/llmessage/tests/llhttpclient_test.cpp b/indra/llmessage/tests/llhttpclient_test.cpp
index 1e0296918c..986fd5f3fc 100644
--- a/indra/llmessage/tests/llhttpclient_test.cpp
+++ b/indra/llmessage/tests/llhttpclient_test.cpp
@@ -1,5 +1,5 @@
 /** 
- * @file llhttpclient_tut.cpp
+ * @file llhttpclient_test.cpp
  * @brief Testing the HTTP client classes.
  *
  * $LicenseInfo:firstyear=2006&license=viewerlgpl$
@@ -33,9 +33,6 @@
 #include <tut/tut.hpp>
 #include "linden_common.h"
 
-// These are too slow on Windows to actually include in the build. JC
-#if !LL_WINDOWS
-
 #include "lltut.h"
 #include "llhttpclient.h"
 #include "llformat.h"
@@ -46,6 +43,7 @@
 #include "llsdhttpserver.h"
 #include "lliohttpserver.h"
 #include "lliosocket.h"
+#include "stringize.h"
 
 namespace tut
 {
@@ -83,7 +81,8 @@ namespace tut
 	struct HTTPClientTestData
 	{
 	public:
-		HTTPClientTestData()
+		HTTPClientTestData():
+			local_server(STRINGIZE("http://127.0.0.1:" << getenv("PORT") << "/"))
 		{
 			apr_pool_create(&mPool, NULL);
 			LLCurl::initClass(false);
@@ -134,13 +133,14 @@ namespace tut
 			delete mServerPump;
 			mServerPump = NULL;
 		}
-	
+
+		const std::string local_server;
+
 	private:
 		apr_pool_t* mPool;
 		LLPumpIO* mServerPump;
 		LLPumpIO* mClientPump;
 
-		
 	protected:
 		void ensureStatusOK()
 		{
@@ -257,8 +257,7 @@ namespace tut
 	template<> template<>
 	void HTTPClientTestObject::test<1>()
 	{
-		skip("google.com unit tests stopped working 2012-06-06");
-		LLHTTPClient::get("http://www.google.com/", newResult());
+		LLHTTPClient::get(local_server, newResult());
 		runThePump();
 		ensureStatusOK();
 		ensure("result object wasn't destroyed", mResultDeleted);
@@ -267,8 +266,8 @@ namespace tut
 	template<> template<>
 	void HTTPClientTestObject::test<2>()
 	{
-		skip("error test depends on dev's local ISP not supplying \"helpful\" search page");
-		LLHTTPClient::get("http://www.invalid", newResult());
+		// Please nobody listen on this particular port...
+		LLHTTPClient::get("http://127.0.0.1:7950", newResult());
 		runThePump();
 		ensureStatusError();
 	}
@@ -345,28 +344,22 @@ namespace tut
 		// won't ever let it run.  Instead get from a known LLSD
 		// source and compare results with the non-blocking get which
 		// is tested against the mini server earlier.
-		skip("secondlife.com is not reliable enough for unit tests.");
-
-
-		LLSD expected;
-
-		LLHTTPClient::get("http://secondlife.com/xmlhttp/homepage.php", newResult());
+		LLHTTPClient::get(local_server, newResult());
 		runThePump();
 		ensureStatusOK();
-		expected = getResult();
+		LLSD expected = getResult();
 
 		LLSD result;
-		result = LLHTTPClient::blockingGet("http://secondlife.com/xmlhttp/homepage.php");
+		result = LLHTTPClient::blockingGet(local_server);
 		LLSD body = result["body"];
 		ensure_equals("echoed result matches", body.size(), expected.size());
 	}
 	template<> template<>
 		void HTTPClientTestObject::test<8>()
 	{
-		skip("google.com unit tests stopped working 2012-06-06");
 		// This is testing for the presence of the Header in the returned results
 		// from an HTTP::get call.
-		LLHTTPClient::get("http://www.google.com/", newResult());
+		LLHTTPClient::get(local_server, newResult());
 		runThePump();
 		ensureStatusOK();
 		LLSD header = getHeader();
@@ -375,12 +368,9 @@ namespace tut
 	template<> template<>
 	void HTTPClientTestObject::test<9>()
 	{
-		skip("google.com unit tests stopped working 2012-06-06");
-		LLHTTPClient::head("http://www.google.com/", newResult());
+		LLHTTPClient::head(local_server, newResult());
 		runThePump();
 		ensureStatusOK();
 		ensure("result object wasn't destroyed", mResultDeleted);
 	}
 }
-
-#endif	// !LL_WINDOWS
diff --git a/indra/llmessage/tests/llsdmessage_test.cpp b/indra/llmessage/tests/llsdmessage_test.cpp
index 0f2c069303..31a791e4b4 100644
--- a/indra/llmessage/tests/llsdmessage_test.cpp
+++ b/indra/llmessage/tests/llsdmessage_test.cpp
@@ -143,7 +143,7 @@ namespace tut
         httpPump.post(request);
         ensure("got response", netio.pump());
         ensure("success response", success);
-        ensure_equals(result.asString(), "success");
+        ensure_equals(result["reply"].asString(), "success");
 
         body["status"] = 499;
         body["reason"] = "custom error message";
diff --git a/indra/llmessage/tests/test_llsdmessage_peer.py b/indra/llmessage/tests/test_llsdmessage_peer.py
index 22edd9dad8..fe4f3a8c01 100644
--- a/indra/llmessage/tests/test_llsdmessage_peer.py
+++ b/indra/llmessage/tests/test_llsdmessage_peer.py
@@ -78,25 +78,32 @@ class TestHTTPRequestHandler(BaseHTTPRequestHandler):
 ##         debug("root node tag %s", tree.getroot().tag)
 ##         return llsd.to_python(tree.getroot())
 
-    def do_GET(self):
+    def do_HEAD(self):
+        self.do_GET(withdata=False)
+
+    def do_GET(self, withdata=True):
         # Of course, don't attempt to read data.
-        self.answer(dict(reply="success", status=500,
-                         reason="Your GET operation requested failure"))
+        data = dict(reply="success", body="avatar", random=17)
+        self.answer(data, withdata=withdata)
 
     def do_POST(self):
         # Read the provided POST data.
         self.answer(self.read_xml())
 
-    def answer(self, data):
+    def answer(self, data, withdata=True):
         debug("%s.answer(%s): self.path = %r", self.__class__.__name__, data, self.path)
         if "fail" not in self.path:
-            response = llsd.format_xml(data.get("reply", llsd.LLSD("success")))
+            data = data.copy()          # we're going to modify
+            # Ensure there's a "reply" key in data, even if there wasn't before
+            data["reply"] = data.get("reply", llsd.LLSD("success"))
+            response = llsd.format_xml(data)
             debug("success: %s", response)
             self.send_response(200)
             self.send_header("Content-type", "application/llsd+xml")
             self.send_header("Content-Length", str(len(response)))
             self.end_headers()
-            self.wfile.write(response)
+            if withdata:
+                self.wfile.write(response)
         else:                           # fail requested
             status = data.get("status", 500)
             # self.responses maps an int status to a (short, long) pair of
diff --git a/indra/newview/tests/llcapabilitylistener_test.cpp b/indra/newview/tests/llcapabilitylistener_test.cpp
index 2ad08dc1f3..e1cbd28f92 100644
--- a/indra/newview/tests/llcapabilitylistener_test.cpp
+++ b/indra/newview/tests/llcapabilitylistener_test.cpp
@@ -156,7 +156,7 @@ namespace tut
         regionPump.post(request);
         ensure("got response", netio.pump());
         ensure("success response", success);
-        ensure_equals(result.asString(), "success");
+        ensure_equals(result["reply"].asString(), "success");
 
         body["status"] = 499;
         body["reason"] = "custom error message";
-- 
cgit v1.2.3


From d167ebe35f8cdec1ca88e0d817e2878f14a5aa68 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Thu, 7 Jun 2012 05:46:47 -0400
Subject: MAINT-1144: Try to fix Windows build error in llhttpclient_test.cpp.

---
 indra/llmessage/tests/llhttpclient_test.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/llmessage/tests/llhttpclient_test.cpp b/indra/llmessage/tests/llhttpclient_test.cpp
index 986fd5f3fc..843c3bcc4b 100644
--- a/indra/llmessage/tests/llhttpclient_test.cpp
+++ b/indra/llmessage/tests/llhttpclient_test.cpp
@@ -363,7 +363,7 @@ namespace tut
 		runThePump();
 		ensureStatusOK();
 		LLSD header = getHeader();
-		ensure_equals("got a header", header.emptyMap().asBoolean(), FALSE);
+		ensure("got a header", ! header.emptyMap().asBoolean());
 	}
 	template<> template<>
 	void HTTPClientTestObject::test<9>()
-- 
cgit v1.2.3


From 749026e547268138b720213cf6845bce22f7e0ce Mon Sep 17 00:00:00 2001
From: "Tank@Test_Master.ftrdhcpuser.net" <Tank@Test_Master.ftrdhcpuser.net>
Date: Thu, 7 Jun 2012 14:01:38 -0700
Subject: widen the floater a bit to make more room for translations

---
 .../skins/default/xui/en/panel_volume_pulldown.xml | 32 +++++++++++-----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml b/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml
index 7e882c2b5e..66a2ddeea8 100644
--- a/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml
+++ b/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml
@@ -11,7 +11,7 @@
  height="155"
  layout="topleft"
  name="volumepulldown_floater"
- width="210">
+ width="225">
    <button
     left="187"
     top_pad="9"
@@ -25,7 +25,7 @@
     scale_image="false">
     <button.commit_callback
        function="Vol.GoAudioPrefs" />
-  </button> 
+  </button>
       <slider
      control_name="AudioLevelMaster"
      follows="top|left"
@@ -34,9 +34,9 @@
      increment="0.025"
      initial_value="0.5"
      label="Master"
-     label_width="50"
+     label_width="60"
      left="10"
-     width="150"
+     width="160"
      layout="topleft"
      name="System Volume"
      show_text="false"
@@ -66,9 +66,9 @@
         increment="0.025"
         initial_value="0.5"
         label="Buttons"
-        label_width="50"
+        label_width="60"
         left="10"
-        width="150"
+        width="160"
         layout="topleft"
         name="UI Volume"
         show_text="false"
@@ -99,9 +99,9 @@
      increment="0.025"
      initial_value="0.5"
      label="Ambient"
-     label_width="50"
+     label_width="60"
      left="10"
-     width="150"
+     width="160"
      layout="topleft"
      name="Wind Volume"
      show_text="false"
@@ -132,9 +132,9 @@
      increment="0.025"
      initial_value="0.5"
      label="Sounds"
-     label_width="50"
+     label_width="60"
      left="10"
-     width="150"
+     width="160"
      layout="topleft"
      name="SFX Volume"
      show_text="false"
@@ -178,9 +178,9 @@
      increment="0.025"
      initial_value="0.5"
      label="Music"
-     label_width="50"
+     label_width="60"
      left="10"
-     width="150"
+     width="160"
      layout="topleft"
      name="Music Volume"
      show_text="false"
@@ -223,9 +223,9 @@
         increment="0.025"
         initial_value="0.5"
         label="Media"
-        label_width="50"
+        label_width="60"
         left="10"
-        width="150"
+        width="160"
         layout="topleft"
         name="Media Volume"
         show_text="false"
@@ -270,9 +270,9 @@
         increment="0.025"
         initial_value="0.5"
         label="Voice"
-        label_width="50"
+        label_width="60"
         left="10"
-        width="150"
+        width="160"
         layout="topleft"
         top_pad="4"
         name="Voice Volume"
-- 
cgit v1.2.3


From 0a163f9ccd31687c910e74bdddd6dd86d849edeb Mon Sep 17 00:00:00 2001
From: "Tank@Test_Master.ftrdhcpuser.net" <Tank@Test_Master.ftrdhcpuser.net>
Date: Thu, 7 Jun 2012 14:02:19 -0700
Subject: remove gear icon

---
 .../newview/skins/default/xui/en/panel_volume_pulldown.xml | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml b/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml
index 66a2ddeea8..6adede0362 100644
--- a/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml
+++ b/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml
@@ -12,20 +12,6 @@
  layout="topleft"
  name="volumepulldown_floater"
  width="225">
-   <button
-    left="187"
-    top_pad="9"
-    width="12"
-    height="12"
-    follows="top|left"
-    name="prefs_btn"
-    image_unselected="Icon_Gear_Foreground"
-    image_disabled="Icon_Gear_Background"
-    image_pressed="Icon_Gear_Press"
-    scale_image="false">
-    <button.commit_callback
-       function="Vol.GoAudioPrefs" />
-  </button>
       <slider
      control_name="AudioLevelMaster"
      follows="top|left"
-- 
cgit v1.2.3


From e8bec251dc98950958be2f4f668c5408fcf56b9b Mon Sep 17 00:00:00 2001
From: Tank_Master <none@none>
Date: Mon, 11 Jun 2012 08:36:10 -0700
Subject: remove tooltip when hovering over main volume icon in the status bar

---
 indra/newview/skins/default/xui/en/panel_status_bar.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/indra/newview/skins/default/xui/en/panel_status_bar.xml b/indra/newview/skins/default/xui/en/panel_status_bar.xml
index 3aa34439f1..dd2a0c6627 100644
--- a/indra/newview/skins/default/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml
@@ -129,6 +129,5 @@
      left_pad="5"
      top="2"
      name="volume_btn"
-     tool_tip="Global Volume Control"
      width="16" />
 </panel>
-- 
cgit v1.2.3