Commit Graph

8550 Commits (69e6c4d947064104f674c0f2dee6750c845d30cf)

Author SHA1 Message Date
Richard Linden 69e6c4d947 EXT-6693 - [crashhunters] crash in LLPopupView::handleMouseEvent 2010-04-07 16:29:06 -07:00
Xiaohong Bao c5756c3f0f merged from viewer-trunk, fix for EXT-6780: to make LLImageBase::allocateData() thread-safe.
Also include some debug code for EXT-6567: crash at LLImageBase::allocateData().
2010-04-09 00:09:12 -06:00
Xiaohong Bao 09d488e20b more fix for EXT-5711: Some textures loading from cache seems jammed.
and possible fix for EXT-5704: FPS drop, and this could be cause freez and crash.
2010-03-25 17:14:27 -06:00
Xiaohong Bao 7de49ce1d1 fix for EXT-6435: crash at writeEntriesAndClose: ASSERT (num_entries == mHeaderEntriesInfo.mEntries) 2010-03-29 11:32:47 -06:00
Xiaohong Bao a0022e65ec fix for EXT-6566: crash at LLTextureCache::updatedHeaderEntriesFile [secondlife-bin lltexturecache.cpp:1292] 2010-03-29 11:28:42 -06:00
Xiaohong Bao 7bd603544e add some debug code for EXT-5394: Crash in LLViewerMediaImpl::calculateInterest() 2010-04-02 10:33:20 -06:00
Xiaohong Bao 8dd401e4a1 fix for EXT-6678: crash at LLTextureCache::openAndReadEntry [secondlife-bin lltexturecache.cpp:1111] 2010-04-01 11:39:01 -06:00
Xiaohong Bao 88df86bcc3 fix for all wierd crashes happening to lltexturecache.cpp, cuased by running viewer 2.0 and viewer 1.23 at the same time. Specifically for the following jiras:
EXT-6692: crash at LLTextureCache::readEntryFromHeaderImmediately [secondlife-bin lltexturecache.cpp:1145]
EXT-6691: crash at LLTextureCache::writeEntryToHeaderImmediately [secondlife-bin lltexturecache.cpp:1126]
possible fix for EXT-6567: crash at LLImageBase::allocateData [secondlife-bin llimage.cpp:170]
2010-04-07 11:51:41 -06:00
Xiaohong Bao 4a8b13e4fd Automated merge with ssh://hg.lindenlab.com/q/viewer-hotfix 2010-04-08 22:39:52 -06:00
Mark Palange (Mani) 3b9e4f43ed Enabling Watchdog. 2010-04-08 17:40:17 -07:00
Xiaohong Bao d34588b7a7 fix for EXT-6278: profile picture is blurry / fuzzy if IM is opened first. 2010-04-08 17:08:32 -06:00
Monroe Linden 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
Richard Linden b69a454aab merge 2010-04-08 16:43:48 -07:00
Richard Linden 70bbcf7c2d EXT-5849 - crash in LLView::drawChildren()
added logging to help track down cause
2010-04-08 16:41:56 -07:00
Tofu Linden 02d3106885 merge from PE's viewer-hotfox 2010-04-08 12:23:13 +01:00
Tofu Linden 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
Callum Prentice da6bba2ed3 DEV-47911: Backport webkit security fixes 2010-03-23 (via new version of LLQtWebKit/Windows) 2010-04-02 14:10:54 -07:00
Monroe Linden 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
Monroe Linden 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
Kent Quirk 8ee0bdbd1f Merge 2010-03-30 10:17:14 -04:00
Kent Quirk 197c4d0ab4 Fix the credits in the right file. 2010-03-30 10:15:53 -04:00
Kent Quirk 59394005f1 Merge from viewer-2-0 2010-03-29 20:33:24 -04:00
Monroe Linden 9e211a3e20 Default MediaShowOnOthers setting to false.
--HG--
branch : EXT-4880
2010-03-29 17:00:44 -07:00
Eli Linden ab6a2456c0 VWR-17649 en_xui_change 2010-03-29 13:16:12 -07:00
Eli Linden 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
Eli Linden 998c7fb94b VWR-17644 undo old 'es' overrides 2010-03-29 12:45:29 -07:00
Tofu Linden 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
Vadim Savchuk f8e44a8974 Merge from default branch
--HG--
branch : product-engine
2010-03-29 18:28:51 +03:00
Aimee Linden 8654ba5e25 EXT-6515 Turn off Vivox automatic crash reporting 2010-03-29 10:49:21 +01:00
Eli Linden bdf4b0b33f IT translation review of set3 2010-03-27 18:07:22 -07:00
Eli Linden 4f766829f3 PL CT global edit 2010-03-26 21:41:33 -07:00
Eli Linden 5ac0348131 fix invalid xml 2010-03-26 21:24:26 -07:00
Eli Linden 3499c46469 Merge 2010-03-26 21:22:42 -07:00
Eli Linden 609767d219 IT translation review for set6C 2010-03-26 21:21:59 -07:00
Eli Linden d60830b522 PT linguistic 2010-03-26 21:12:43 -07:00
Kent Quirk 8543b1d2af Merge. 2010-03-26 22:03:47 -04:00
Kent Quirk f66057f0ef Merge 2010-03-26 22:02:14 -04:00
Kent Quirk 524b207125 Fix application icon position for Mac 2010-03-26 22:00:59 -04:00
Eli Linden 40fdb2b932 IT translation review for set6A; FR and ES linguistic 2010-03-26 17:46:35 -07:00
Eli Linden b2234485b2 Merge 2010-03-26 16:35:37 -07:00
Eli Linden dde671f1df ES linguistic 2010-03-26 16:34:20 -07:00
Eli Linden c59484a562 DE FR ES linguistic 2010-03-26 16:32:20 -07:00
Eli Linden e5edc41ac8 DA CT edit 2010-03-26 16:26:33 -07:00
Eli Linden 8155e60dee IT translation for set5C 2010-03-26 15:48:11 -07:00
Kent Quirk 2b68fd569d Merge 2010-03-26 18:34:27 -04:00
Eli Linden fe1a1a09dc FR linguistic 2010-03-26 14:38:00 -07:00
Kent Quirk b33b9c326b Merge 2010-03-26 17:07:02 -04:00
Kent Quirk 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
Mark Palange (Mani) 4888c9a103 Merge patches in q/viewer-hotfix to viewer-2-0 2010-03-26 14:04:03 -07:00
Mark Palange (Mani) 55f549db45 EXT-6517 Now updating the location value in refreshLocation.
Reviewed by Richard
2010-03-26 12:52:02 -07:00