a98b4b6bee
merge changes for 3.7.7-release
2014-05-07 11:09:04 -04:00
776aadf4ef
OPEN-199: replace the confusing STANDALONE switch with USESYSTEMLIBS
2014-03-19 17:30:07 -04:00
f7dc3937cd
SH-4641 FIX Interesting: Incorrect amount of system memory detected on Mac
2013-12-03 20:27:41 -08:00
34ff2fc46b
merge with release
2013-12-02 14:57:29 -08:00
17e9c872ad
Automated merge with http://bitbucket.org/lindenlab/viewer-release
2013-11-11 19:17:49 -08:00
10705b4360
Merge 3.6.11 for RC-ability
2013-11-11 15:50:01 -08:00
970ee73e9a
Fix release merge issues (included upstream changes not yet in release from bear)
2013-10-25 11:48:43 -07:00
420a1af0c8
SH-4774 FIX: textures are blurry on Mac
2013-09-11 16:26:03 -07:00
ddd9d1396c
merge
2013-09-09 20:19:36 -07:00
21ab67416d
SH-4774 FIX: textures are blurry on Mac
2013-09-09 20:18:12 -07:00
52da9f5f49
merge with viewer-release
2013-09-09 18:58:41 -07:00
e2019e8a3b
Merge downstream code with viewer-release
2013-09-09 16:17:16 -07:00
f515c132e4
MAINT-2850 Fix for linux build
2013-08-22 11:38:42 +03:00
37626bb4a2
BUILDFIX: gcc build fixes
2013-08-21 14:45:04 -07:00
ce6d63be47
Fix file EOL format
2013-08-21 20:41:30 +00:00
87add5bfb6
MAINT-2850 FIXED Windows 8.1 detected as running in windows 8 compatibility mode always
2013-08-20 20:49:36 +03:00
612892b45a
SH-4433 WIP: Interesting: Statistics > Ping Sim is always 0 ms
...
continued conversion to units system
made units perform type promotion correctly and preserve type in arithmetic
e.g. can now do LLVector3 in units
added typedefs for remaining common unit types, including implicits
2013-08-18 22:30:27 -07:00
25937040de
SH-4433 WIP: Interesting: Statistics > Ping Sim is always 0 ms
...
converted many values over to units system in effort to track down
source of 0 ping
2013-08-16 12:38:12 -07:00
e340009fc5
second phase summer cleaning
...
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
e40065f82c
BUILDFIX: #include and dependency cleanup
2013-07-19 15:03:05 -07:00
862cdf3061
SH-4297 WIP interesting: viewer-interesting starts loading cached scene late
...
fixed ostream precision munging in llsys
2013-07-18 15:08:46 -07:00
0a96b47663
merge with viewer-release
2013-06-05 19:05:43 -07:00
c38204f5e0
Unwind cruft from hunting for 2707 they won't end up in vwr-dev-mat
2013-06-05 14:26:27 -07:00
50689a13ba
BOOG2707 uncomment cleared suspects
2013-06-05 06:14:27 -07:00
ea24612561
BUG-2707 make use of OsOutputDebugString _DEBUG only on Windows to avoid throwing unhandlable exceptions in coroutines in RelWithDebInfo builds
2013-06-04 07:51:27 -07:00
1f9137ed5f
BUG-2707 fix unref'd var
2013-06-02 19:52:59 -07:00
a1888e72fa
BUG-2707 eliminate debug message and memory dump from FrameWatcher, which appears to be going off on login for some
2013-06-02 17:08:01 -07:00
c19200eb00
BUG-2707 add some logging to help narrow down what part of login instance handling is going awry
2013-05-30 17:01:28 -07:00
3779e51bfc
Merged with https://bitbucket.org/lindenlab/viewer-beta
2013-05-13 22:22:51 -04:00
3bb708d706
merge up to latest viewer-development for merge to 3.5.2
2013-04-19 14:42:56 -04:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
98e02a5d76
Merge new boost and add OS X 10.8 mods
2013-02-22 09:49:58 -08:00
29e747c4f1
And thus, the demonic mouse position conversions from view space to screen space were tamed.
2013-01-22 15:37:01 -05:00
0d8f1077a6
Automated merge with http://bitbucket.org/lindenlab/viewer-development
2013-01-04 16:46:25 -08:00
9d77e030d9
SH-3406 WIP convert fast timers to lltrace system
...
cleaning up build
moved most includes of windows.h to llwin32headers.h to disable min/max macros, etc
streamlined Time class and consolidated functionality in BlockTimer class
llfasttimer is no longer included via llstring.h, so had to add it manually in several places
2012-11-14 23:52:27 -08:00
a36b66bd14
MAINT-1815 Fix for excessive memory usage in Mayfair. Disable tcmalloc. Disable private memory pools. Make viewer large address aware on windows.
...
Reviewed by Kelly
2012-11-07 16:03:54 -06:00
b3338955ba
linux version number fixes
2013-02-22 19:57:02 +00:00
3b8092e31f
add OS version string
2013-02-21 13:19:39 -05:00
a47e9bd97b
EXP-1525 FIXED Potential fix for a crash at shutdown: added some error handling to saving inventory cache.
2012-01-10 16:35:36 +02:00
ac94b66a08
storm-1729: ensure that cpu id has no leading or trailing spaces for ease of comparison and formatting
2011-12-13 15:58:34 -05:00
b215c724c1
Automated merge with http://hg.secondlife.com/viewer-development
2011-08-11 10:11:59 -07:00
d712dde69e
SH-2218 FIX -- v2.8.x Viewers crash consistently when I actively use other applications
...
* Mac memory stats now extracted from proper system calls.
Reviewed by Nat Linden.
2011-08-05 11:05:48 -07:00
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
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
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
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
774306bc25
CHOP-753: have to cast pointer passed to GetProcessMemoryInfo().
...
GetProcessMemoryInfo() is prototyped with PROCESS_MEMORY_COUNTERS*, so to
accept PROCESS_MEMORY_COUNTERS_EX* as documented, have to cast.
2011-07-07 14:47:20 -04:00
65657b9f5c
CHOP-753: uh, Microsoft docs lied about header file to use?
...
Remove <kfuncs.h>, documented header file for GetCurrentProcess().
2011-07-07 14:20:37 -04:00
Oz Linden