6babf8abd2
Merge LL 3.7.7
2014-06-09 11:29:57 -07:00
12f0f8cb72
changed over to manual naming of MemTrackable stats
...
changed claimMem and disclaimMem behavior to not pass through argument
added more mem tracking stats to floater_stats
2013-10-01 13:46:43 -07:00
053d97db1b
better memory usage for LLTrace (tighter packing of recording arrays)
...
removed complicated and unnecessary fast timer gapless handoff logic (it should be gapless anyway)
improved MemTrackable API, better separation of shadow and footprint
added memory usage stats to floater_stats.xml
2013-09-25 19:12:35 -07:00
0dfc08d22a
BUILDFIX: more bad merge stuff
...
also added ability for statbar to show memtrackable info
2013-09-19 15:21:46 -07:00
cbe397ad13
changed fast timer over to using macro
...
another attempt to move mem stat into base class
2013-09-05 14:04:13 -07:00
d8c02bf062
Merge
2013-08-19 16:09:28 -06: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
075a7bcc98
SH-4297 WIP interesting: viewer-interesting starts loading cached scene late
...
dependency cleanup - removed a lot of unecessary includes
2013-07-18 15:09:45 -07:00
8208a40412
BUILDFIX: reverted changes that attempted to automate mem track
...
stat definition as they don't work on gcc/clang
2013-07-01 18:50:51 -07:00
04bdc8ba83
SH-4294 FIX Interesting: Statistics Texture cache hit rate is always 0%
...
also, removed LLTrace::init and cleanup
removed derived class implementation of memory stat for LLMemTrackable
is automatic now
2013-07-01 17:04:01 -07:00
0a96b47663
merge with viewer-release
2013-06-05 19:05:43 -07:00
a74b5dfa92
SH-3931 WIP Interesting: Add graphs to visualize scene load metrics
...
fixed mem stat tracking...now properly tracks memory footprint with floating point
precision
cleaned up macros for unit declaration
renamed units to SI standard for 1024 multiples (kibibytes, etc)
fixed units output for scene monitor dump
2013-06-04 19:45:33 -07:00
c7f7c4bc4d
Merge viewer-beta
2013-05-09 13:14:49 -07:00
ddd5659f81
merge changes for DRTVWR-294
2013-04-19 10:11:29 -04:00
066f2acadf
Forgot to commit @#! merge
2013-04-11 16:23:36 -07:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
68f9f656cd
merge with viewer-release
2013-03-22 00:44:59 -07:00
f07b9c2c69
renamed LLTrace stat gathering classes/methods to make the structure of LLTrace clearer
...
Count becomes CountStatHandle
Count.sum becomes sum(Count, value), etc.
2013-03-06 11:08:25 -08:00
11fe124ae9
merging in viewer-beta.
...
Most of the merge was clean, a couple conflicts.
Brought over a couple patches manually for llpolymesh.
2013-01-24 16:22:49 -05:00
831e4f443b
Merge LL 3.6.3 pass 1
2013-08-26 17:09:27 -07:00
d4640277d0
Merge LL 3.5.3 release.
2013-07-09 16:24:58 -07:00
e8bb9d4601
Backout eefd363ebae7 (Crashhunting in LLImageRaw) the assertion got hit and thus the theory that the image gets garbled correct.
2013-04-24 23:43:29 +02:00
38ac71c62b
Hunting a weird crash. Seems like LLImageRaw can be changed by another thread while one thread tries to read the data. Added a few assertions to test this theory.
2013-04-23 23:58:52 +02:00
4ebd4b3616
SH-3468 WIP add memory tracking base class
...
further compile error fixes
2013-01-04 14:09:02 -08:00
cbff0e7ab8
SH-3468 WIP add memory tracking base class
...
attempted fix for gcc compile errors
can't use typeid() on a class that doesn't have a method
defined in a translation unit
fix is to force classes deriving from LLMemTrackable to
use their own static member named sMemStat
2013-01-04 13:48:35 -08:00
d3b9f446a6
fix for MAINT-2147: crash in LLTextureCache::writeToFastCache on OSX
2013-01-03 22:37:44 -07:00
802e738b77
Fix for alpha blending using gl fixed-functions not matching shader implementation
2012-12-18 23:40:31 +00:00
1f56e57008
SH-3468 WIP add memory tracking base class
...
created memory tracking trace type
instrumented a few classes with memory tracking
2012-12-18 00:58:26 -08:00
c0224cc47a
merge with viewer-development
2012-11-19 19:06:36 -08:00
7f0d6e0377
Pull back viewer-development with latest beta merges
2012-10-16 09:58:31 -07:00
e7a5dc7cda
pull back changes from 3.4.1-beta8
2012-10-16 09:36:15 -04:00
c97730988e
MAINT-1721 Fix for crash when clicking "back" button after editing appearance.
...
Reviewed by VoidPointer
2012-10-15 15:59:41 -05:00
371b66a6ef
Automated merge with http://bitbucket.org/lindenlab/viewer-development
2012-09-06 11:47:48 -07:00
38acb45af8
Merge in latest viewer-development
2012-09-05 17:17:54 -07:00
6425b3cd65
Merge RLVa SSB update
2013-02-24 18:24:48 -08:00
e1ee0494bf
Merge FS LGPL
2013-02-08 00:14:47 -08:00
838d611bcf
Handle some out of memory situations a bit more gracefully.
2013-02-07 23:51:49 +01:00
169263d8b0
Merge LL 3.4.5 beta 3
2013-01-28 01:56:00 -08:00
7893cf238d
Add ndfile.h into llapr.h so it is visible where needed. Add typedef apr_file_t tFiletype to LLAPRFile and then use this in all classes instead of apr_file_t, this way we can swap between LLAPRFile and ndFile with use a typedef
2013-01-23 02:25:14 +01:00
ceea332a9c
Change old style comments <ND> to <FS:ND> to avoid any future confusion/
2012-12-16 05:19:32 +01:00
5b5f4c8bf5
Merge LL 3.4.2 release,
...
broken revision, KDU package needs updating, mac packager also likely broken
2012-12-14 07:59:55 -08:00
93d4b47252
Merge LL 3.4.1 beta 10
2012-10-26 09:59:19 -07:00
4a5ad35793
MAINT-570 Remove unused memory tracking system LLMemType
2012-07-20 11:42:15 -05:00
0d80aced24
for SH-3073: implement a fast cache system for texture fetching
2012-06-12 17:01:48 -06:00
c410a4e332
SH-3080 : Implement the TextureReverseByteRange setting so we can play with that parameter
2012-04-12 20:19:56 -07:00
91094d92a7
SH-3060 : Implement new byte range computation, cleaned up use of compression rate as well.
2012-04-05 22:05:00 -07:00
782981866a
SH-3060 : New byte range implementation. Intermediate (not working) state.
2012-04-04 18:58:34 -07:00
df09fd8e8b
SH-3060 : Preliminary implementation of the new byte range computation, implement setting to turn it on or off
2012-04-02 19:05:32 -07:00
fe7a4d0183
SH-3047 : Add a load_size argument to llimage_libtest and allow partial image file to be loaded.
2012-03-15 14:07:54 -07:00
bc6f669ff4
SH-3047 : Read the number of levels from the j2c image header instead of relying on hacked computation based on width / height.
2012-03-15 13:01:14 -07:00
Tank_Master