017a23aaf4
SH-2218 WORK AROUND -- v2.8.x Viewers crash consistently when I actively use other applications
...
* Just removed mac memory stats to make a low-risk work-around.
2011-08-03 17:07:49 -07:00
01ee25cca4
disable watchdog
2011-08-02 19:16:56 -04:00
6850f13f50
late fix to set watchdog on at 60 seconds
2011-07-29 15:08:27 -04:00
67bd8c314c
late fix to disable VBO on Macs for performance
2011-07-29 15:07:52 -04:00
fb9f092972
reconciled .hgtags
2011-07-29 13:32:51 -04:00
ad96a4ef47
mergeback from viewer-release
2011-07-29 13:29:32 -04:00
75c1dbd74e
Added tag DRTVWR-70_2.8.0-release, 2.8.0-release for changeset 493d9127ee50
2011-07-29 13:09:45 -04:00
254263cffc
Added tag DRTVWR-70_2.8.0-release, 2.8.0-release for changeset 493d9127ee50
2011-07-26 15:51:25 -04:00
ed701685f6
merged .hgtags
2011-07-26 15:41:49 -04:00
0e3cea49aa
Added tag DRTVWR-73_2.8.1-beta1, 2.8.1-beta1 for changeset 2c7e459e0c88
2011-07-25 11:52:43 -04:00
c118ec2099
merge up changes for 2.8.0 release
2011-07-21 15:02:03 -04:00
c567f0dcdd
Added tag DRTVWR-68_2.7.5-release, 2.7.5-release for changeset 6866d9df6efb
2011-07-20 16:43:32 -04:00
67e365ba57
Added tag DRTVWR-71_2.8.0-beta1, 2.8.0-beta1 for changeset e1ed60913230
2011-07-18 11:46:24 -04:00
187844d5fc
STORM-1506 FIXED Reset the estate to global sun when changing region environment settings.
...
By the way, moved estate info storage from the REGION/ESTATE floater to a model class.
2011-07-15 19:15:30 +03:00
54bb91fd03
merge changes for 2.7.5 release
2011-07-14 14:47:15 -04:00
dc0765fc3d
Added tag DRTVWR-66_2.7.4-release, 2.7.4-release for changeset 057f319dd8ec
2011-07-14 11:17:28 -07:00
35ae78a96c
more fix for STORM-1468: [crashhunters] pre-login crash at LLViewerWindow::LLViewerWindow(std::basic_string,std::allocator > const &,std::basic_string,std::allocator > const &,int,int,int,int,int,int) [secondlife-bin llviewerwindow.cpp]
2011-07-11 14:17:57 -06:00
8529c37dee
merge changes for storm-1488
2011-07-11 06:16:19 -04:00
58e09b5f52
merge changes for chop-661
2011-07-11 06:14:46 -04:00
b5f00fd120
merge changes for storm-1481
2011-07-11 06:13:07 -04:00
d190a02db8
merge changes for storm-1472
2011-07-11 06:12:36 -04:00
f34e5f761f
merge changes for storm-1483
2011-07-11 06:11:49 -04:00
02cfd17236
Automated merge with http://hg.secondlife.com/viewer-development
2011-07-09 10:57:22 -04:00
b40a44d24d
increment version to 2.8.0
2011-07-09 07:58:11 -04:00
1b7f5c8be7
fix for STORM-1468: [crashhunters] pre-login crash at LLViewerWindow::LLViewerWindow(std::basic_string,std::allocator > const &,std::basic_string,std::allocator > const &,int,int,int,int,int,int) [secondlife-bin llviewerwindow.cpp]
2011-07-08 21:01:41 -06:00
e1eb7a26af
merge changes for storm-1510
2011-07-18 12:14:57 -04:00
5f3194be1d
reconciled .hgtags
2011-07-18 12:08:01 -04:00
771ff8a764
Added tag 2.8.1-start for changeset 502f6a5deca9
2011-07-18 08:30:42 -04:00
ec2d528952
re-enable the watchdog
2011-07-18 08:30:21 -04:00
2f49b60ddc
merge changes for storm-1482
2011-07-16 08:05:26 -04:00
ae805d511d
merge late release changes and tags
2011-07-16 08:04:49 -04:00
94adbe81af
pull back late beta fix
2011-07-16 08:03:22 -04:00
14a06fd1c8
Merge for STORM-1482
2011-07-15 16:26:15 -07:00
5f99d30c20
STORM-1482 Always run the crash loggers, they will check what to do and how to clean up.
2011-07-15 16:25:32 -07:00
dba72d2565
storm-1510: update to new login display url
2011-07-15 17:10:36 -04:00
a517d32c48
STORM-1482 Change the defaults, look in the app_settings dir for configs as well.
2011-07-15 12:46:06 -07:00
fc5aaf5df8
merge changes for storm-1509
2011-07-15 13:20:49 -04:00
f3dd16ac47
STORM-1482 Little bit of Windows crash report value logging.
2011-07-14 12:38:24 -07:00
4d432251e4
merge changes for storm-1507
2011-07-13 17:45:06 -04:00
1f369cad59
merge changes for open-99
2011-07-13 17:43:45 -04:00
21bacab562
merge changes for eli_viewer-development
2011-07-13 15:19:34 -04:00
a6a0d5dda7
SH-1637 FIX, SH-1638 FIX - fixes jittery camera problems
2011-07-13 13:55:04 -04:00
ed648b1f08
CHOP-753: Eliminate redundant array-of-pair-arrays in LLMemoryInfo.
...
(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-12 20:14:39 -04:00
450b64981c
Merge for STORM-1482
2011-07-12 15:52:14 -07:00
42daa3497b
STORM-1482 The Viewer shouldn't overwrite the crash behavior settings, some 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-12 15:48:02 -07:00
825e4a5399
FIX STORM-1494 remove duplicate ID and xml snippet
2011-07-12 12:22:07 -07:00
c37a986c9a
sync with viewer-development
2011-07-12 12:12:48 -07:00
e58a0e9b26
CHOP-753: Defend against boost::regex exceptions.
...
(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-12 14:34:31 -04:00
4e23550363
CHOP-753: make getAvailableMemoryKB() only load data on Windows.
...
(per Monty code review)
Other platforms return -1 anyway, so don't need to call load methods.
2011-07-12 13:34:09 -04:00
44c7c6feaa
merge changes for storm-1315
2011-07-11 16:52:00 -04:00
Leslie Linden