6babf8abd2
Merge LL 3.7.7
2014-06-09 11:29:57 -07:00
80dfbbaacd
merge from viewer-release
2013-10-08 11:59:24 -07:00
c82f2997e4
Clang fix from Cron Stardust
2013-12-02 22:33:26 -07:00
2a03e8f9fb
MAINT-3172 fix rendering regressions from release mergedown
2013-09-20 16:44:39 -07:00
a77f424945
BUILDFIX: fix for crashes in unit tests on mac and linux
2013-08-23 13:41:51 -07:00
d83c51a4e1
BUILDFIX: converted platform-specific files over to new LL_INFOS, etc macros
2013-08-14 21:58:30 -07:00
cc31b4ae79
SH-4399 FIX: Interesting: Texture console MB Bound 0/384 and texture queue bounces once per second
...
SH-4346 FIX: Interesting: some integer Statistics are displayed as floating point after crossing region boundary
made llerrs/infos/etc properly variadic wrt tags
LL_INFOS("A", "B", "C") works, for example
fixed unit tests
remove llsimplestat
2013-08-12 20:05:16 -07:00
e740fcc959
BUILDFIX: removed usage of llversionserver.h
2013-07-31 10:23:18 -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
79029149a4
Automated merge with file:///F:%5Cviewer-bear
2013-06-21 12:51:29 -05:00
a2a6bf20d7
merge with release
2013-06-20 16:46:23 -07:00
0a96b47663
merge with viewer-release
2013-06-05 19:05:43 -07:00
e1c1428569
Merge viewer-dev-materials and bugfix in LLPanelFace::getState using material instead of mMaterial
2013-05-11 20:38:23 -07:00
ee2fce8790
Merge downstream code and viewer-beta
2013-05-09 14:10:45 -07:00
025c890958
Merge vwr-dev-mat
2013-05-01 08:11:15 -07:00
806d09b114
Merge 3.5.1 into Materials
2013-04-30 19:50:05 -07:00
b7235f1a44
MAINT-2612: Remove no-longer-valid unused-var warning suppressions.
...
Somehow viewer-cat acquired a lot of source lines (in several different files)
of the form:
(void)somevar;
where ?somevar? was not declared. Apparently someone introduced an unused
declaration of ?somevar?, encountered unused-variable warnings, introduced the
(void) casts to suppress those warnings, then deleted the declarations --
without deleting the (void) casts. It seems worth noting that the resulting
code should not have compiled successfully on any platform.
2013-04-22 14:35:07 -04:00
3bb708d706
merge up to latest viewer-development for merge to 3.5.2
2013-04-19 14:42:56 -04:00
ddd5659f81
merge changes for DRTVWR-294
2013-04-19 10:11:29 -04:00
327c99cadb
merge up to 3.5.2 development
2013-04-16 16:01:32 -04:00
ae028e7987
removed unused data structures
2013-04-11 19:08:57 -07:00
b42b789723
Merge in downstream code (chui fixes, materials)
2013-04-11 16:18:34 -07:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
e8b8a12b73
Mods to make compile on gcc 4.6.3 work mo betta
2013-03-12 10:48:05 -07:00
46ab23c94b
llinventory merge fixes
2013-03-11 18:02:16 -04:00
8bb3d0891d
merge up to 3.4.5-release
2013-02-12 13:27:03 -05:00
19233999ed
disable timing sensitive check in the pipe and pump fitness test
2013-01-31 09:34:00 -05: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
c937d8ab44
More VS2013 compile fixes
2013-10-28 18:34:50 -07:00
05ad3a1c29
Merge Viewer-bear (merge of materials + fixes) to FS-exp
2013-09-21 11:44:46 -07:00
52d9b07503
Merge viewer-bear
2013-09-12 21:15:34 -07:00
718f6fa0ff
merge LL 3.6.1
2013-07-10 00:23:23 -07:00
d4640277d0
Merge LL 3.5.3 release.
2013-07-09 16:24:58 -07:00
fdc006be1e
More merge fixing to lldir.cpp
2013-06-26 16:56:19 -06:00
c61db3d380
Merge LGPL tip
2013-06-26 12:59:37 -07:00
14001c54df
Gastly CHUI merge pass 1, don't count on anything to work.
2013-06-26 12:14:54 -07:00
4d8fdffa43
Remove what I missed last commit
2013-06-20 12:23:40 -06:00
62f04088f0
Dynamically loaded script library
...
*Script libraries for different platforms are loaded dynamically at startup via xml
*Remove unused LSO byte code compiler
2013-06-20 11:24:34 -06:00
0ba9a00c31
SH-3468 WIP add memory tracking base class
...
cleaned up hacks used to get unit tests working
LLTrace::init now supports recursive initialization/cleanup
put NOMINMAX back in win32 header wrappers
2013-01-08 23:50:27 -08:00
a7dbaaa0af
merge changes for DRTVWR-250
2013-01-08 09:45:27 -05:00
3c341a11ab
SH-3468 WIP add memory tracking base class
...
more fixes for unit test crashes
added llcommon initialization/teardown for unit tests
that indirectly trigger lltrace
changed access of atomic refcount to use preincrement/decrement
operators to reflect desired semantics
always call apr_initialize in LLCommon::initClass, even
if already initialized...apr does internal reference counting
to keep things straight
2013-01-08 00:25:07 -08:00
6841351502
SH-3468 WIP add memory tracking base class
...
fix for unit test failures...cleanup apr without destroying
pools, allowing LLProxy to clean itself up as a singleton (and
avoiding spurious dependencies associated with manually destorying
singletons that rely on apr pools)
2013-01-06 21:37:31 -08:00
0d8f1077a6
Automated merge with http://bitbucket.org/lindenlab/viewer-development
2013-01-04 16:46:25 -08:00
8a2c30b388
MAINT-1986: in TeamCity, do not reload saved hashmap_test data.
...
Rev b7fd7c95c571 allows a developer to debug a failure in hashmap_test 1. Once
the test fails, rerunning that test will replay the same failure to try to
permit debugging it. But that behavior is extremely undesirable under
TeamCity! In a TeamCity run, don't even check for saved data file.
2012-12-19 06:40:44 -05:00
40e78a80cc
Pull and merge viewer-development
2012-12-04 14:31:15 -08:00
e0432f98ee
SH-3563. Pull and merge from viewer-development. Modest code changes to fix alignment issue in llAppearance.
2012-11-28 16:36:34 -05:00
c0224cc47a
merge with viewer-development
2012-11-19 19:06:36 -08:00
c136b43214
SH-3406 WIP convert fast timers to lltrace system
...
eliminated min and max macros from windows.h
got rest of viewer to compile against llfasttimer changes
2012-11-15 19:46:09 -08:00
08cbabdcc0
disable tests that fail too often on Windows
2013-02-13 14:20:45 -05:00
5ade41c09d
disable timing sensitive check in the pipe and pump fitness test
2013-01-31 09:34:00 -05:00
Tank_Master