summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Expand)Author
2011-07-21mergeLogan Dethrow
2011-07-21merge changes for eli2_viewer-developmentOz Linden
2011-07-20FIX INTL-58 set25, light set4 translation for 6 languageseli
2011-07-19mergeLogan Dethrow
2011-07-19STORM-1112 Added LLProxy::applyProxySettings() to apply proxy settings to cur...Logan Dethrow
2011-07-18sync with viewer-developmenteli
2011-07-18merge changes for storm-1515Oz Linden
2011-07-18merge changes for storm-1517Oz Linden
2011-07-18merge changes for storm-1516Oz Linden
2011-07-18sync with viewer-developmenteli
2011-07-18merge changes for storm-1510Oz Linden
2011-07-18re-enable the watchdogOz Linden
2011-07-16merge changes for storm-1482Oz Linden
2011-07-16merge late release changes and tagsOz Linden
2011-07-16pull back late beta fixOz Linden
2011-07-16Automated merge with https://bitbucket.org/lindenlab/viewer-developmentjenn
2011-07-15Automated merge with https://bitbucket.org/lindenlab/viewer-developmentjenn
2011-07-15After review and testing, realized that 'WatchdogEnabled' is actually true to...jenn
2011-07-15Merge for STORM-1482Aaron Stone
2011-07-15STORM-1482 Always run the crash loggers, they will check what to do and how t...Aaron Stone
2011-07-15storm-1510: update to new login display urlOz Linden
2011-07-15STORM-1506 FIXED Reset the estate to global sun when changing region environm...Vadim ProductEngine
2011-07-14FIX STORM-1494 remove duplicate ID and xml snippeteli
2011-07-14merge changes for 2.7.5 releaseOz Linden
2011-07-13Code cleanup for the SOCKS 5 proxy viewer.Logan Dethrow
2011-07-13SH-1637 FIX, SH-1638 FIX - fixes jittery camera problemsBrad Payne (Vir Linden)
2011-07-13Watchdog timeout now set to 60 seconds for long-term use (instead of 20, used...jenn
2011-07-12Merge for STORM-1482Aaron Stone
2011-07-12STORM-1482 The Viewer shouldn't overwrite the crash behavior settings, some c...Aaron Stone
2011-07-12mergeLogan Dethrow
2011-07-12Removed default proxy server.Logan Dethrow
2011-07-11merge changes for storm-1315Oz Linden
2011-07-11merge changes for storm-1459Oz Linden
2011-07-11merge changes for storm-1325Oz Linden
2011-07-11Automated merge with https://bitbucket.org/squire_linden/viewer-development-c...Xiaohong Bao
2011-07-11more fix for STORM-1468: [crashhunters] pre-login crash at LLViewerWindow::LL...Xiaohong Bao
2011-07-11Renamed proxy settings in xui.Logan Dethrow
2011-07-11merge changes for storm-1481Oz Linden
2011-07-11merge changes for storm-1472Oz Linden
2011-07-11merge changes for storm-1483Oz Linden
2011-07-08fix for STORM-1468: [crashhunters] pre-login crash at LLViewerWindow::LLViewe...Xiaohong Bao
2011-07-08merge changes for storm-1491Oz Linden
2011-07-08merge changes for storm-1489Oz Linden
2011-07-08ER-910 cleanup: removed a stale comment, tweaked text in About Land dialogsimon@lindenlab.com
2011-07-08EXP-990 FIX Cannot select from Texture picker for Groups profile picRichard Linden
2011-07-08merge changes for storm-1484Oz Linden
2011-07-08merge changes for vwr-25753Oz Linden
2011-07-08storm-899 and vwr-26095: correct xml to restore body parts accordian in appea...Oz Linden
2011-07-08EXP-983 FIX -- Viewer crashes around Place Profile and Landmarks listing in V...Leslie Linden
2011-07-08merge changes for storm-1462Oz Linden