From 20af2d325a4340aca997efbea752849e9f15d041 Mon Sep 17 00:00:00 2001
From: Monroe Linden <monroe@lindenlab.com>
Date: Wed, 20 Jan 2010 15:17:48 -0800
Subject: New mac build of llqtwebkit to fix EXT-4169.

This build is based on:

Commit 16264ea12f1320e25f3d4fad3a9ddd4d3f8d2e68 of http://qt.gitorious.org/~girish/qt/girishs-qt/commits/lindenqt

Revision 24ce3025f844 of https://hg.lindenlab.com/monroe/llqtwebkit-4.6/
---
 install.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/install.xml b/install.xml
index d8b9a4289d..226d0d3551 100644
--- a/install.xml
+++ b/install.xml
@@ -948,9 +948,9 @@ anguage Infrstructure (CLI) international standard</string>
           <key>darwin</key>
           <map>
             <key>md5sum</key>
-            <string>2eb58f544c0d912aa382de2c947be7f1</string>
+            <string>d97d843704514ae1b5f153fab2931920</string>
             <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-4.6-darwin-20100104.tar.bz2</uri>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-4.6-darwin-20100120.tar.bz2</uri>
           </map>
           <key>linux</key>
           <map>
-- 
cgit v1.2.3


From 622f8b59ceb286f955351b6185a98919f03ed136 Mon Sep 17 00:00:00 2001
From: Callum Prentice <callum@lindenlab.com>
Date: Wed, 20 Jan 2010 15:27:58 -0800
Subject: Fix for EXT-4169 - drop down menus do not working in LLQtWebKit with
 Qt 4.6

---
 install.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/install.xml b/install.xml
index 5069e44d46..30cff85669 100644
--- a/install.xml
+++ b/install.xml
@@ -962,9 +962,9 @@ anguage Infrstructure (CLI) international standard</string>
           <key>windows</key>
           <map>
             <key>md5sum</key>
-            <string>c41be1ba9728555ae5a2d2151c96dfe1</string>
+            <string>18c1a4059bad1504a457e70c8c218033</string>
             <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-windows-qt4.6-20100115.tar.bz2</uri>
+            <uri>http://viewer-source-downloads.s3.amazonaws.com/install_pkgs/llqtwebkit-windows-qt4.6-20100120.tar.bz2</uri>
           </map>
         </map>
       </map>
-- 
cgit v1.2.3


From 8841ad4794bb0bfab7b9273284781afb1b9a39c6 Mon Sep 17 00:00:00 2001
From: Rick Pasetto <rick@lindenlab.com>
Date: Wed, 20 Jan 2010 15:37:33 -0800
Subject: Bump up URL entry max to 1024 (approved by Richard)

---
 indra/newview/skins/default/xui/en/floater_media_browser.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/skins/default/xui/en/floater_media_browser.xml b/indra/newview/skins/default/xui/en/floater_media_browser.xml
index 4b280ac59f..70dac7e41c 100644
--- a/indra/newview/skins/default/xui/en/floater_media_browser.xml
+++ b/indra/newview/skins/default/xui/en/floater_media_browser.xml
@@ -80,7 +80,7 @@
              height="20"
              layout="topleft"
              left_pad="5"
-             max_chars="255"
+             max_chars="1024"
              name="address"
              top_delta="0"
              width="540">
-- 
cgit v1.2.3


From 417f0ede41d1dcfed45ae56f515f2ea6d63e599f Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Wed, 20 Jan 2010 15:59:26 -0800
Subject: EXT-4388 Crash in octree line segment intersection code (more
 accurately, it was - I believe - reading over the end of a buffer in the
 pick-mask lookup)

reviewed by qarl.
---
 indra/llrender/llimagegl.cpp | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/indra/llrender/llimagegl.cpp b/indra/llrender/llimagegl.cpp
index d873005fd9..cd493481d5 100644
--- a/indra/llrender/llimagegl.cpp
+++ b/indra/llrender/llimagegl.cpp
@@ -1736,12 +1736,25 @@ BOOL LLImageGL::getMask(const LLVector2 &tc)
 		if (u < 0.f || u > 1.f ||
 		    v < 0.f || v > 1.f)
 		{
-			llerrs << "WTF?" << llendl;
+			LL_WARNS_ONCE("render") << "Ugh, u/v out of range in image mask pick" << LL_ENDL;
+			u = v = 0.f;
+			llassert(false);
 		}
 		
 		S32 x = (S32)(u * width);
 		S32 y = (S32)(v * height);
 
+		if (x >= width)
+		{
+			LL_WARNS_ONCE("render") << "Ooh, width overrun on pick mask read, that coulda been bad." << LL_ENDL;
+			x = llmax(0, width-1);
+		}
+		if (y >= height)
+		{
+			LL_WARNS_ONCE("render") << "Ooh, height overrun on pick mask read, that woulda been bad." << LL_ENDL;
+			y = llmax(0, height-1);
+		}
+
 		S32 idx = y*width+x;
 		S32 offset = idx%8;
 
-- 
cgit v1.2.3