3b9e4f43ed
Enabling Watchdog.
2010-04-08 17:40:17 -07:00
e02e45fd76
Fix for EXT-6615 (SL webkit no longer reports "Second Life" in the HTTP_USER_AGENT)
...
The issue here is that initBrowserWindow() was doing the wrong thing if it got called after the set_user_agent message was received.
Made the handler for the set_user_agent message save the string in a member variable (mUserAgent).
Initialize mUserAgent to the default string in the MediaPluginWebKit constructor.
initBrowserWindow() now sets the user agent string from mUserAgent instead of from a literal.
2010-03-29 18:36:47 -07:00
b69a454aab
merge
2010-04-08 16:43:48 -07:00
70bbcf7c2d
EXT-5849 - crash in LLView::drawChildren()
...
added logging to help track down cause
2010-04-08 16:41:56 -07:00
02d3106885
merge from PE's viewer-hotfox
2010-04-08 12:23:13 +01:00
cc9d069722
Update Linux build of qt/llqtwebkit. For DEV-47911.
...
revision c02879cea1c0070eb264e261d316a77d420741c7 in http://qt.gitorious.org/+lindenqt/qt/lindenqt (currently head of the 'lindenqt' branch)
revision 8eff99f78fb0 in http://bitbucket.org/lindenlab/llqtwebkit/ (currently head of the 'default' branch)
2010-04-07 15:34:24 +01:00
da6bba2ed3
DEV-47911: Backport webkit security fixes 2010-03-23 (via new version of LLQtWebKit/Windows)
2010-04-02 14:10:54 -07:00
e7b7dc36f7
Updated Mac build of LLQtWebKit library.
...
This was built from:
revision c02879cea1c0070eb264e261d316a77d420741c7 in http://qt.gitorious.org/+lindenqt/qt/lindenqt (currently head of the 'lindenqt' branch)
revision 8eff99f78fb0 in http://bitbucket.org/lindenlab/llqtwebkit/ (currently head of the 'default' branch)
2010-04-02 13:49:35 -07:00
50b97bfaf5
Fix for EXT-6663 (TOS Screen logic for enabling agreement checkbox is questionable)
...
* remove the use of the start_url parameter, and instead store the loading url as a string in the xui, so that there's no chance of the loading screen page completing before we add our observer.
* replace the "load complete count" with explicit state variables for whether the loading screen has completed and whether the site is alive
* don't begin trying to load the real URL until both of the above conditions are met (and begin the load no matter which order they are satisfied in)
Reviewed by Richard at http://codereview.lindenlab.com/1218007
2010-04-02 13:30:14 -07:00
8ee0bdbd1f
Merge
2010-03-30 10:17:14 -04:00
197c4d0ab4
Fix the credits in the right file.
2010-03-30 10:15:53 -04:00
59394005f1
Merge from viewer-2-0
2010-03-29 20:33:24 -04:00
9e211a3e20
Default MediaShowOnOthers setting to false.
...
--HG--
branch : EXT-4880
2010-03-29 17:00:44 -07:00
ab6a2456c0
VWR-17649 en_xui_change
2010-03-29 13:16:12 -07:00
78436b3237
EXT-6572 (major bug) DE workaround to remove the word "Kaufen" and leave just the L$ link to avoid obvious linguistic error due to poor source design, at Simone's request
2010-03-29 12:51:01 -07:00
998c7fb94b
VWR-17644 undo old 'es' overrides
2010-03-29 12:45:29 -07:00
ac10340316
EXT-6580 restrict size of linux's fallback font list
...
reviewed and approved for hotfix branch by Q.
2010-03-29 18:03:58 +01:00
f8e44a8974
Merge from default branch
...
--HG--
branch : product-engine
2010-03-29 18:28:51 +03:00
8654ba5e25
EXT-6515 Turn off Vivox automatic crash reporting
2010-03-29 10:49:21 +01:00
bdf4b0b33f
IT translation review of set3
2010-03-27 18:07:22 -07:00
4f766829f3
PL CT global edit
2010-03-26 21:41:33 -07:00
5ac0348131
fix invalid xml
2010-03-26 21:24:26 -07:00
3499c46469
Merge
2010-03-26 21:22:42 -07:00
609767d219
IT translation review for set6C
2010-03-26 21:21:59 -07:00
d60830b522
PT linguistic
2010-03-26 21:12:43 -07:00
8543b1d2af
Merge.
2010-03-26 22:03:47 -04:00
f66057f0ef
Merge
2010-03-26 22:02:14 -04:00
524b207125
Fix application icon position for Mac
2010-03-26 22:00:59 -04:00
40fdb2b932
IT translation review for set6A; FR and ES linguistic
2010-03-26 17:46:35 -07:00
b2234485b2
Merge
2010-03-26 16:35:37 -07:00
dde671f1df
ES linguistic
2010-03-26 16:34:20 -07:00
c59484a562
DE FR ES linguistic
2010-03-26 16:32:20 -07:00
e5edc41ac8
DA CT edit
2010-03-26 16:26:33 -07:00
8155e60dee
IT translation for set5C
2010-03-26 15:48:11 -07:00
2b68fd569d
Merge
2010-03-26 18:34:27 -04:00
fe1a1a09dc
FR linguistic
2010-03-26 14:38:00 -07:00
b33b9c326b
Merge
2010-03-26 17:07:02 -04:00
32253813b4
EXT-3818 -- absolute minimal fix for Viewer 2, can be better fixed in 2.1. Previous proposed fix caused a crash on at least one machine, too risky.
2010-03-26 17:05:29 -04:00
4888c9a103
Merge patches in q/viewer-hotfix to viewer-2-0
2010-03-26 14:04:03 -07:00
55f549db45
EXT-6517 Now updating the location value in refreshLocation.
...
Reviewed by Richard
2010-03-26 12:52:02 -07:00
c58125e804
Merge
2010-03-26 15:42:32 -04:00
7464a71318
Merge
2010-03-26 15:41:43 -04:00
f5fa5dbb25
merge
...
--HG--
branch : product-engine
2010-03-26 21:06:57 +02:00
1ed3117a6d
Backed out changeset 686628355e4a as it caused a crash.
2010-03-26 11:38:42 -04:00
d2cbc6c5b6
Fix for EXT-3818 -- back out some code that was put in for EXT-6373, but overreached.
2010-03-26 10:43:07 -04:00
3eca1e1ff9
EXT-6514 -- backing out my incorrect fix for this and putting in the one from PE.
2010-03-26 10:23:21 -04:00
6bee636a8b
FR linguistic
2010-03-25 16:46:44 -07:00
ff91cb1f79
VWR-18445 en_xui_change for DE truncation; remove old DE hard returns; FR linguistic
2010-03-25 16:44:58 -07:00
bb53ecc458
VWR-18451 en_xui_change for DE truncation; remove invalid DE name in mime_type.xml; remove invalid attributes in floater_about_land and the extra .. in "set" button translation
2010-03-25 16:08:56 -07:00
9d08bcca13
VWR-18457 en_xui_change for DE build menu overlapping text
2010-03-25 15:24:13 -07:00
Mark Palange (Mani)