summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2010-12-28Automated merge with file:///Users/oz/Work/viewer-developmentOz Linden
2010-12-27STORM-523 : pull into viewer-developmentMerov Linden
2010-12-27VWR-20879: Allow find_vc_dir() to work with VCExpressRobin Cornelius
2010-12-24merge fix for storm-411Oz Linden
2010-12-24merge fix for storm-784Oz Linden
2010-12-24merge improved fix for STORM_785Oz Linden
2010-12-23Automated merge with ssh://bitbucket.org/aleric/viewer-development-aleric-exportOz Linden
2010-12-22STORM-810 : Auto update and related changes (integration request from team ↵Merov Linden
chopper)
2010-12-22STORM-808 : merge webkit upgrade to Qt v4.7.1Merov Linden
2010-12-21SOCIAL-374 FIX (Windows) Avatar images not loading on join.secondlife.com in ↵callum
Webkit 4.7 Updated llqtwebkit build for Windows from changeset f8e31d21585d in the llqtwebkit repository.
2010-12-21SOCIAL-374 FIX Avatar images not loading on join.secondlife.com in Webkit 4.7Monroe Linden
Updated llqtwebkit build for Mac from changeset f8e31d21585d in the llqtwebkit repository.
2010-12-21SOCIAL-374 FIX Avatar images not loading on join.secondlife.com in Webkit 4.7Monroe Linden
Reviewed by Callum
2010-12-21STORM-151 : pull in viewer-developmentMerov Linden
2010-12-21STORM-460 : pull in viewer-developmentMerov Linden
2010-12-21STORM-524 : pull in viewer-developmentMerov Linden
2010-12-21STORM-453 : pull in viewer-developmentMerov Linden
2010-12-21Merge from trunkAndrew A. de Laix
2010-12-20STORM-151 : Fix llui_libtest integration testMerov Linden
2010-12-20SOCIAL-399 FIX Viewer crash when canceling http auth on a media primMonroe Linden
Reviewed by Callum at http://codereview.lindenlab.com/5636001
2010-12-20Fix for a couple of minor merge issues.Monroe Linden
2010-12-20Remove unimplemented software updater option. Fix potential double start of ↵Andrew A. de Laix
updater service.
2010-12-20Merge from viewer-development.Monroe Linden
2010-12-20fix windows build?Andrew A. de Laix
2010-12-20Merge - final pull of viewer-development.Monty Brandenberg
2010-12-20STORM-411 FIXED The most of additional options in the Teleport History ↵Paul Guslisty
profile are always disabled - Deleted unimplemented menu items from XML - Hide "Make a Landmark" menu item in case "Teleport History Place Profile" panel is opened
2010-12-20merge fix for storm-412Oz Linden
2010-12-20merge fix for storm-801Oz Linden
2010-12-20merge fix for storm-796Oz Linden
2010-12-18STORM-511 FIXED Display tooltip for sender name on group notices.Vadim ProductEngine
Changes: * Set tooltip for sender name. * Overridden handleTooltip() for the tooltip to be of normal (yellow) color.
2010-12-18Merge STORM-796Vadim ProductEngine
2010-12-18STORM-796 ADDITIONAL_FIX Fixed Mac build.Vadim ProductEngine
2010-12-18STORM-412 FIXED Resident profile controls aren't reshaped on changing panel ↵Paul Guslisty
width - Added parameters for text boxes to follow right side of panel
2010-12-18STORM-460 FIXED "Go" button is cropped from right in the Media BrowserPaul Guslisty
- Decreased button width
2010-12-18STORM-801 FIXED Wrong checkbox label in panel preferences, advanced tabPaul Guslisty
- Corrected checkbox label
2010-12-17SOCIAL-395 (FIX) LLWebContentFloater not handling Javascript size and window ↵callum
position parameters in Change to llfloaterwebcontent.cpp is a whitespace change only to fix a broken checkin
2010-12-17Better fix for CHOP-286 - reenabled bandwidth limits on linux now that we've ↵brad kittenbrink
fixed the freeze.
2010-12-17SOCIAL-371 (PARTIAL) HTTP Auth sites do not load / allow login on Media on a ↵callum
Prim faces in Webkit 4.7 Fixes broken text substituition of realm/host only.
2010-12-17Temporary workaround for CHOP-286: bandwidth limits freeze the downloader ↵brad kittenbrink
thread on linux
2010-12-17Adding newline char at EOF so linux version builds (sigh)callum
2010-12-17Merge from viewer-development post 2.4 releaseMonty Brandenberg
2010-12-17Automated merge with https://bitbucket.org/mani_linden/viewer-developmentAndrew A. de Laix
2010-12-17ich bin stupid; this should actually fix the windows build.Andrew A. de Laix
2010-12-17don't rely on stream cast to bool behavior; use explicit fail call.Andrew A. de Laix
2010-12-17and don't break other builds.Andrew A. de Laix
2010-12-17fix windows build (suppress warning from lexical_cast)Andrew A. de Laix
2010-12-17Updated contributions.txt for STORM-799 and STORM-800Kitty Barnett
2010-12-17Adjust parameter in call to setFocusOnAvatar to be more efficient (don't ↵Jonathan Yap
animate)
2010-12-16ESC-237 No static init of LLAtomics and move TFRequest out of unnamed namespace.Monty Brandenberg
Linux startup crash appears to be due to static/global C++ init of LLAtomic types. The initializer with explicit value makes some runtime calls and it looks like these assume, at least on Linux, that apr_initialize() has been called. So move the static POST count to a member and provide accessors and increment/decrement. Command queue was built on a pointer to a class in anonymous namespace and that's not quite valid. Made it a nested class (really a nested forward declaration) while keeping the derived classes in anonymous.
2010-12-16SOCIAL-370 FIX (2) Links to External Web Pages not working in Floaters such ↵callum
as Search in Webkit 4.7 branch
2010-12-16SOCIAL-393 FIX Need a keyboard shortcut to open the Web Content floatercallum