From 7e3007b63521c4b0c5bbad1c3964a557fc526ce2 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Fri, 15 Aug 2008 23:45:57 -0500
Subject: Second Life viewer sources 1.20.11

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

(limited to 'linden/indra/newview/llwebbrowserctrl.cpp')

diff --git a/linden/indra/newview/llwebbrowserctrl.cpp b/linden/indra/newview/llwebbrowserctrl.cpp
index 1d187cb..cfe5cb6 100644
--- a/linden/indra/newview/llwebbrowserctrl.cpp
+++ b/linden/indra/newview/llwebbrowserctrl.cpp
@@ -862,7 +862,7 @@ BOOL LLWebBrowserTexture::render()
 					mTexture->setSubImage( pixels, 
 											media_data_width, media_data_height,
 												0, 0, 
-													width, height );
+													llmin(width, media_data_width), llmin(media_data_height, height) );
 				};
 			}
 			else
-- 
cgit v1.1