From 4027788dfcbc7414d3d3cae5ef274906ad30f83d Mon Sep 17 00:00:00 2001
From: callum <none@none>
Date: Wed, 16 Dec 2009 11:47:57 -0800
Subject: Tweaks to XUI to make sure long urls are clipped in various dialogs.

---
 indra/newview/skins/default/xui/en/floater_tools.xml  | 1 +
 indra/newview/skins/default/xui/en/inspect_object.xml | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index 5e68850e30..f2a5d902e7 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -2676,6 +2676,7 @@ even though the user gets a free copy.
 			 height="18"
 			 layout="topleft"
 			 left="10"
+       use_ellipsis="true" 
 			 read_only="true"
 			 name="media_info"
 			 width="180" />
diff --git a/indra/newview/skins/default/xui/en/inspect_object.xml b/indra/newview/skins/default/xui/en/inspect_object.xml
index cedf83f8b1..00e00b9694 100644
--- a/indra/newview/skins/default/xui/en/inspect_object.xml
+++ b/indra/newview/skins/default/xui/en/inspect_object.xml
@@ -92,8 +92,8 @@ This is a really long description for an object being as how it is at least 80 c
    height="13"
    left_delta="0"
    name="object_media_url"
-   top_pad="-1"
-   width="291"
+   bottom_pad="2"
+   width="200"
    max_length = "50"
    use_ellipses="true">
    http://www.superdupertest.com
-- 
cgit v1.2.3


From 6cb3d25942bc2dc67f41efedb3a90db1b559b3b9 Mon Sep 17 00:00:00 2001
From: callum <none@none>
Date: Wed, 16 Dec 2009 13:10:03 -0800
Subject: Merge with tip

---
 indra/llplugin/llpluginprocessparent.cpp           | 1 +
 indra/media_plugins/webkit/media_plugin_webkit.cpp | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'indra')

diff --git a/indra/llplugin/llpluginprocessparent.cpp b/indra/llplugin/llpluginprocessparent.cpp
index dab6d645dd..608e444375 100644
--- a/indra/llplugin/llpluginprocessparent.cpp
+++ b/indra/llplugin/llpluginprocessparent.cpp
@@ -62,6 +62,7 @@ LLPluginProcessParent::LLPluginProcessParent(LLPluginProcessParentOwner *owner)
 	// initialize timer - heartbeat test (mHeartbeat.hasExpired()) 
 	// can sometimes return true immediately otherwise and plugins 
 	// fail immediately because it looks like 
+//	mHeartbeat.initClass();
 	mHeartbeat.setTimerExpirySec(PLUGIN_LOCKED_UP_SECONDS);
 }
 
diff --git a/indra/media_plugins/webkit/media_plugin_webkit.cpp b/indra/media_plugins/webkit/media_plugin_webkit.cpp
index 707edaa3d6..844da76042 100644
--- a/indra/media_plugins/webkit/media_plugin_webkit.cpp
+++ b/indra/media_plugins/webkit/media_plugin_webkit.cpp
@@ -205,7 +205,6 @@ private:
 		{
 			// create single browser window
 			mBrowserWindowId = LLQtWebKit::getInstance()->createBrowserWindow( mWidth, mHeight );
-
 #if LL_WINDOWS
 			// Enable plugins
 			LLQtWebKit::getInstance()->enablePlugins(true);
@@ -216,7 +215,9 @@ private:
 			// Disable plugins
 			LLQtWebKit::getInstance()->enablePlugins(false);
 #endif
-            
+			// Enable cookies
+			LLQtWebKit::getInstance()->enableCookies( true );
+
 			// tell LLQtWebKit about the size of the browser window
 			LLQtWebKit::getInstance()->setSize( mBrowserWindowId, mWidth, mHeight );
 
-- 
cgit v1.2.3