21ff3d0d1c
CHOP-753: fix minor compilation errors on Linux
2011-06-29 20:42:30 -04:00
7f8ec9f142
CHOP-753: Introduce LLSD access to LLMemoryInfo ** BROKEN **
...
This is known not to compile on Mac yet; checking in to concurrently work on
Linux-specific code.
2011-06-29 20:35:44 -04:00
1262f710b5
CHOP-753: Report Linux memory stats 1/line, like other platforms.
...
Previous code deliberately flowed the different lines from MEMINFO_FILE
together on a single line, which seems pointless to me, since we want to be
able to grep the viewer log to recognize individual stats.
Also replace classic-C LLFILE* machinery used to read MEMINFO_FILE with
std::ifstream and std::getline().
2011-06-28 23:09:00 -04:00
26be53aede
CHOP-753: Introduce a sliding window of framerate samples.
...
The trouble with remembering the slowest-ever framerate is that framerate
drops dramatically on login, then typically bounces back to something
reasonable during the session. So the session-normal framerate has to drop
pretty dramatically before it falls below the original login framerate. To
address this, only remember the last ~10 minutes of framerates, and log memory
stats every time a new framerate is slower than the previous 10 minutes.
2011-06-28 16:01:16 -04:00
57c230b73e
CHOP-753: suppress VS fatal warning 4355
2011-06-28 08:58:10 -04:00
abb8a7018d
CHOP-753: Log LLMemoryInfo whenever framerate hits a new low.
...
Introduce FrameWatcher, a static object that hooks into the LLEventPump named
"mainloop" to get a call every frame. Track framerate over a defined sample
time (20 seconds atm); track minimum and log LLMemoryInfo every time we hit a
new minimum.
2011-06-28 08:21:49 -04:00
2619f3db1f
CHOP-753: add timestamp and <mem> marker to memory stats log lines
2011-06-24 10:46:38 -04:00
0ec4d813eb
Log enriched memory info for Mac too.
...
Add Mac logic to LLMemoryInfo::stream(): run vm_stat and log its output.
Add comments with Mac and Linux suggestions to
LLMemoryInfo::getAvailableMemoryKB(), responding to comment:
//do not know how to collect available memory info for other systems.
2011-06-23 14:50:28 -04:00
f657e8e16f
remove error from build logs by taking out obsolete param (cg said this was ok to do)
2011-06-22 11:37:46 -04:00
c8232b6595
update codeticket configuration for my review builds
2011-06-22 11:36:52 -04:00
a5474e3398
remove a bunch of builds that are no longer needed
2011-06-22 11:30:18 -04:00
9a2e35f7ca
merge changes for storm-1421
2011-06-22 08:30:59 -04:00
c0fa40141b
FIX VWR-25160 en_xui_change
2011-06-21 16:15:58 -07:00
54195e8125
FIX VWR-25159
2011-06-21 16:07:28 -07:00
2a3a01dcc9
FIX VWR-25118
2011-06-21 15:40:13 -07:00
00da6b3501
merged back tags and late changes from viewer-pre-beta
2011-06-21 16:58:31 -04:00
687a925fda
pull late release change back from viewer-pre-release
2011-06-21 16:57:27 -04:00
192f51f426
pull back tags from viewer-release
2011-06-21 16:14:10 -04:00
ed684fb2ed
FIX VWR-25072
2011-06-21 12:00:08 -07:00
6977c09a88
FIX VWR-25071
2011-06-21 11:58:54 -07:00
fcf2ed5901
merged .hgtags & BuildParams
2011-06-21 11:47:58 -04:00
4d77146b90
Added tag 2.7.4-start for changeset 6af10678de47
2011-06-21 07:25:19 -04:00
83b4eb2201
SH-1618 isFullbright causes AvatarEyes GL shader to fail to link.
2011-06-20 16:42:31 -07:00
47c49b5bc5
sync with viewer-development
2011-06-20 11:22:02 -07:00
b9b1500979
SH-1618 Fix for shaders being disabled on mac due to switch statement in indexed texture rendering code.
2011-06-20 11:55:22 -05:00
7650bc6887
merge
2011-06-20 10:34:12 -05:00
ede3b577d8
increment viewer version to 2.7.5
2011-06-20 06:11:03 -04:00
7f6d49df43
fix DOS line endings
2011-06-17 17:38:24 -04:00
3444d77609
merge changes for storm-1388
2011-06-17 17:34:27 -04:00
068c6d4509
merge mesh branch changes (storm-1390)
2011-06-17 17:32:28 -04:00
5e5be51ede
storm-1389
2011-06-17 17:30:58 -04:00
7614ceff24
Automated merge with ssh://hg@bitbucket.org/lindenlab/viewer-pre-release
2011-06-17 16:20:27 -04:00
34674d935b
FIX VWR-25070
2011-06-17 11:40:48 -07:00
6575258ff9
FIX VWR-25068 en_xui_change
2011-06-17 11:39:56 -07:00
c4d37c3cae
WIP INTL-46 Traditional Chinese translation update 6/17
2011-06-17 11:34:11 -07:00
796624d947
STORM-1320 OPEN-21 STORM-312 Update libndofdev on linux. Fixes spacenavigator.
2011-06-17 13:07:14 -04:00
e63f6311be
fix for STORM-1274: crash at LLVOCacheEntry::~LLVOCacheEntry() line 138
2011-06-16 15:55:22 -06:00
806b11c572
merge
2011-06-16 17:53:14 -04:00
6c5ae7f6ab
Fix for linux build failure, hopefully
2011-06-16 17:00:12 -04:00
8114464a72
merge
2011-06-16 15:58:55 -04:00
cc6e804129
SH-1166 FIX
2011-06-16 15:58:34 -04:00
c445b9ee61
reconciled .hgtags
2011-06-16 15:53:16 -04:00
7645c6a19f
Added tag DRTVWR-60_2.7.1-release, 2.7.1-release for changeset a9abb9633a26
2011-06-16 15:43:14 -04:00
9d0351550e
sync with viewer-development
2011-06-16 12:32:30 -07:00
9d9d9197a0
merge
2011-06-16 15:24:14 -04:00
6d436f152b
Fix for camera wonkiness (sh-1654 ...)
2011-06-16 15:23:49 -04:00
6532d5db2d
SH-1166 WIP
2011-06-15 18:38:30 -04:00
47b9f588df
Automated merge with http://hg.secondlife.com/mesh-development
2011-06-15 16:28:12 -06:00
0bb7bcc96c
fix for SH-1788: Assert in texture load when uploading textured mesh model
...
and beyond: fixed the thread-safe and highest texture resolution flaws in the mesh texture uploading flow.
2011-06-15 16:20:33 -06:00
8e532652eb
merge
2011-06-15 17:08:55 -04:00
Nat Goodspeed