Merge remote-tracking branch 'mccabe/exp' into weekly

Conflicts:  (Keeping these around as a record, there was some strangeness.
	.gitignore
	linden/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp
	linden/indra/newview/llfloaterregioninfo.cpp
	linden/indra/newview/llfloatertos.cpp
	linden/indra/newview/llpanellogin.cpp
	linden/indra/newview/skins/default/html/en-us/loading-error/index.html
	linden/indra/newview/skins/default/html/en-us/loading/loading.html
	linden/indra/newview/skins/default/xui/en-us/floater_about.xml
	linden/install.xml

1 files changed, 16 insertions, 0 deletions

diff --git a/linden/indra/newview/llfloaterimagepreview.cpp b/linden/indra/newview/llfloaterimagepreview.cpp
index aa8a94f..e792f8c 100644
--- a/linden/indra/newview/llfloaterimagepreview.cpp
+++ b/linden/indra/newview/llfloaterimagepreview.cpp
@@ -616,6 +616,22 @@ BOOL LLFloaterImagePreview::handleScrollWheel(S32 x, S32 y, S32 clicks)
         return TRUE;
 }
 
+BOOL LLFloaterImagePreview::handleHScrollWheel(S32 x, S32 y, S32 clicks)
+{
+        const F32 RAD_PER_CLICK = -F_PI / 16.0f;
+
+        if (mPreviewRect.pointInRect(x, y) && mAvatarPreview)
+        {
+                mAvatarPreview->rotate(RAD_PER_CLICK * clicks, 0);
+                mAvatarPreview->refresh();
+
+                mSculptedPreview->rotate(RAD_PER_CLICK * clicks, 0);
+                mSculptedPreview->refresh();
+        }
+
+        return TRUE;
+}
+
 //-----------------------------------------------------------------------------
 // onMouseCaptureLost()
 //-----------------------------------------------------------------------------