cf8c7701df
STORM-1221 FIXED Hard coded dates made localizable under Group Profile 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-19 20:04:24 +03:00
4dc0850da7
merge changes for storm-1515
2011-07-18 15:41:14 -04:00
4adb212438
merge changes for storm-1517
2011-07-18 15:40:35 -04:00
24524bee42
merge changes for storm-1516
2011-07-18 15:39:58 -04:00
9e3c1f59d9
merge changes for storm-1510
2011-07-18 15:38:25 -04:00
26a76757f6
merge changes for beta branch tag
2011-07-18 15:37:29 -04:00
030b24188a
sync with viewer-development
2011-07-18 11:09:58 -07: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
67e365ba57
Added tag DRTVWR-71_2.8.0-beta1, 2.8.0-beta1 for changeset e1ed60913230
2011-07-18 11:46:24 -04:00
50d271a2ae
increment viewer version to 2.8.2
2011-07-18 08:31:32 -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
1b7316c7e4
Automated merge with https://bitbucket.org/lindenlab/viewer-development
2011-07-16 05:53:34 +00:00
077bb8b39e
Automated merge with https://bitbucket.org/lindenlab/viewer-development
2011-07-15 23:39:17 +00:00
86a806137b
After review and testing, realized that 'WatchdogEnabled' is actually true 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-15 23:26:19 +00: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
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
143db44c9a
FIX STORM-1494 remove duplicate ID and xml snippet
2011-07-14 15:23:23 -07:00
f3dd16ac47
STORM-1482 Little bit of Windows crash report value logging.
2011-07-14 12:38:24 -07: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
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
f015c073cd
Watchdog timeout now set to 60 seconds for long-term use (instead of 20, used during crash pile-on).
...
Updated setting description field to describe how setting the value of WatchdogEnabled will affect Viewer behavior.
2011-07-13 00:16:43 +00: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
121d004b32
merge changes for storm-1459
2011-07-11 16:51:06 -04:00
7b9fc42941
merge changes for storm-1325
2011-07-11 16:49:29 -04:00
8fc1335894
Automated merge with https://bitbucket.org/squire_linden/viewer-development-crash-horde
2011-07-11 14:23:33 -06:00
90ceac118c
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
8fcda650a7
CHOP-753: Add classic-C-style diagnostics around popen("vm_stat").
...
On Mac, where LLMemoryInfo relies on a child process rather than any sort of
internal system API, try to produce more informative LL_WARNS output if
popen() fails to run vm_stat, or if vm_stat terminates with nonzero rc.
2011-07-11 14:24:28 -04:00
607f60d6f6
CHOP-753: Add timestamp to LLMemoryInfo's LLSD stats block.
...
For postprocessing these stats, we'll want the time at which they were
captured. We'll want the current framerate too, but handle that at a higher
level.
2011-07-11 10:57:14 -04:00
c94bc42892
increment viewer version to 2.8.1
2011-07-11 08:44:19 -04:00
1927214e66
Added tag 2.8.0-start for changeset e1ed60913230
2011-07-11 08:43:23 -04:00
Seth ProductEngine