summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2011-07-22merge changes from snowstorm team review buildOz Linden
2011-07-21merge changes for eli2_viewer-developmentOz Linden
2011-07-20FIX INTL-58 set25, light set4 translation for 6 languageseli
2011-07-19merge changes for storm-1487Oz Linden
2011-07-19merge changes for storm-1221Oz Linden
2011-07-19merge changes for storm-1502Oz Linden
2011-07-19merge changes for storm-1503Oz Linden
2011-07-19merge changes for vwr-26066Oz Linden
2011-07-19merge changes for storm-1476Oz Linden
2011-07-19STORM-1487 FIXED Changed the "get more gestures" marketplace URL.Vadim ProductEngine
2011-07-19STORM-1221 FIXED Hard coded dates made localizable under Group Profile ↵Seth ProductEngine
Land/Assets. Added a function for parsing a date string of specific format. Added strings defining the date format in Group Profile Land/Assets that should be localized.
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-18merge changes for storm-1510Oz Linden
2011-07-18sync with viewer-developmenteli
2011-07-18merge changes for storm-1510Oz Linden
2011-07-18increment viewer version to 2.8.2Oz 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 ↵jenn
to its name, and is a boolean, not a timeout value. 'MainloopTimeoutDefault' is the actual timeout value. Updated descriptions and values accordingly to set Watchdog timeout to 60 seconds.
2011-07-15Merge for STORM-1482Aaron Stone
2011-07-15STORM-1482 Always run the crash loggers, they will check what to do and how ↵Aaron Stone
to clean up.
2011-07-15storm-1510: update to new login display urlOz Linden
2011-07-15STORM-1482 Change the defaults, look in the app_settings dir for configs as ↵Aaron Stone
well.
2011-07-15merge changes for storm-1509Oz Linden
2011-07-15STORM-1506 FIXED Reset the estate to global sun when changing region ↵Vadim ProductEngine
environment settings. By the way, moved estate info storage from the REGION/ESTATE floater to a model class.
2011-07-14FIX STORM-1494 remove duplicate ID and xml snippeteli
2011-07-14STORM-1482 Little bit of Windows crash report value logging.Aaron Stone
2011-07-14merge changes for 2.7.5 releaseOz Linden
2011-07-13merge changes for storm-1507Oz Linden
2011-07-13merge changes for open-99Oz Linden
2011-07-13SH-1637 FIX, SH-1638 FIX - fixes jittery camera problemsBrad Payne (Vir Linden)
2011-07-13STORM-1503 FIXED Find floater doesn't set focus to its browser.Paul ProductEngine
Added tab stop for browser to get focus when find floater is focused.
2011-07-13STORM-1502 FIXED Disable "Delete Water/Sky/Day Preset" dialogs if no user ↵Vadim ProductEngine
presets exist.
2011-07-13Watchdog timeout now set to 60 seconds for long-term use (instead of 20, ↵jenn
used during crash pile-on). Updated setting description field to describe how setting the value of WatchdogEnabled will affect Viewer behavior.
2011-07-12CHOP-753: Eliminate redundant array-of-pair-arrays in LLMemoryInfo.Nat Goodspeed
(per Monty code review) The notion of storing LLMemoryInfo data both as an LLSD::Map and an LLSD::Array of pair arrays arose from a (possibly misguided) desire to continue producing stats output into the viewer log in the same order it always used to be produced. There is no evidence that anyone cares about the order of those stats in the log; there is no other use case for preserving order. At Monty's recommendation, eliminate generating and storing the array-of-pair-arrays form: directly store LLSD::Map.
2011-07-12Merge for STORM-1482Aaron Stone
2011-07-12STORM-1482 The Viewer shouldn't overwrite the crash behavior settings, some ↵Aaron Stone
cleanups to the crash reporters, and the ability to use --set GroupName.SettingName to set parameters outside of the (default) Global settings group.
2011-07-12CHOP-753: Defend against boost::regex exceptions.Nat Goodspeed
(per Monty code review) Explain why we intentionally don't suppress exceptions from boost::regex objects constructed with string literals. Catch std::runtime_error from boost::regex_search() and boost::regex_match(); log and return false.
2011-07-12CHOP-753: make getAvailableMemoryKB() only load data on Windows.Nat Goodspeed
(per Monty code review) Other platforms return -1 anyway, so don't need to call load methods.
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 ↵Xiaohong Bao
https://bitbucket.org/squire_linden/viewer-development-crash-horde