91aba8feb9
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
2013-09-09 15:55:09 -06:00
504c645ab6
fix a login crash
2013-09-09 15:54:33 -06:00
4f44366731
BUILDFIX: don't use typeinfo() in static object constructor of baseclass
2013-09-09 11:43:12 -07:00
62d40c8d85
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
2013-09-09 12:00:16 -06:00
a9d22b0f58
some fix for SH-4416: Interesting: memory footprint is larger when loading from cache while ObjectCacheViewCullingEnabled is enabled than when it's disabled.
2013-09-09 11:58:52 -06:00
1f9e73bbdb
rebalance the object cache octrees.
2013-09-09 11:30:52 -06:00
01098f5dab
eliminate some redundant geometry rebuilding operations during teleporting
2013-09-09 11:29:25 -06:00
f04fe8010a
cancel redundant memory alignments for some base classes to get better memory performance
2013-09-09 11:25:10 -06:00
e4cacda5a0
BUILDFIX: unit tests still using old sMemStat declarations
2013-09-05 16:24:57 -07:00
4032c518e4
BUILDFIX: type typo
2013-09-05 15:33:04 -07:00
9dc6478544
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
2013-09-05 14:21:57 -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
736efc7b57
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
2013-08-30 11:02:50 -06:00
f713fe492f
fix for SH-4295: Interesting: Teleporting to previous location leave some objects invisible.
2013-08-30 11:02:15 -06:00
12688c8b54
merge
2013-08-29 23:06:24 -07:00
4e2e3f3f95
SH-4292 FIX: Interesting: My avatar declouds slower in Interesting viewer than in Release viewer
...
moved occlusion culling earlier in login process
2013-08-29 22:50:45 -07:00
89cc73cbd1
merge
2013-08-29 15:26:16 -07:00
f0a642898d
SH-4377 FIX: Interesting: Windows viewer crashes when SceneLoadingMonitorEnabled is enabled
2013-08-29 15:25:48 -07:00
e2212f8633
SH-4377 FIX: Interesting: Windows viewer crashes when SceneLoadingMonitorEnabled is enabled
2013-08-29 15:20:20 -07:00
1751650dbc
add some debug settings for easier tuning up performance.
2013-08-29 13:14:56 -06:00
126a977bf8
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
2013-08-28 17:28:19 -06:00
edd1478cc0
fix for SH-4332: Cacheable object highlights from Render Metadata -> Update Type do not render
2013-08-28 17:27:28 -06:00
b1297dce44
SH-4453 Interesting: SceneLoadingMonitorEnabled does not work until the camera turns
...
made sceneloadingmonitor setting not persist
2013-08-27 19:33:03 -07:00
bf99887cbb
SH-4453 FIX: Interesting: SceneLoadingMonitorEnabled does not work until the camera turns
...
set enabled flag before calling freeze scene
2013-08-27 19:32:26 -07:00
5ddd5694b5
fixed bad logic in unit test
2013-08-27 18:59:32 -07:00
5a22ab5261
more gcc fixes
2013-08-27 18:10:41 -07:00
1f58bcc59c
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
2013-08-27 18:08:52 -07:00
25e2fbe419
got comparisons between implicit and explicit units working right
2013-08-27 18:08:32 -07:00
35e8c81dd8
gcc build fix
2013-08-27 16:48:57 -07:00
00bd492b30
got linear unit conversions (like fahrenheit <-> celsius) working correctly
...
further optimizations for codegen
2013-08-27 16:36:36 -07:00
014969690b
shuffled things around to get MSVC optimizer to generate optimal code
...
in particular, created shortcut overloads for conversions and moved
comparison operators into member functions
2013-08-27 16:04:15 -07:00
9dbc3b50a4
forgot a file
2013-08-27 14:44:49 -07:00
a7aed07a5b
broke out llunit.h into llunittype.h and llunits.h for unit declarations
...
changed unit declarations macros to make a lot more sense
2013-08-27 13:41:19 -07:00
7ab616c187
BUILDFIX: fix for windows unit test failures...don't do unnecessary
...
manipulation of callsite strings in llerror
2013-08-26 19:58:29 -07:00
82e96bb389
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
2013-08-26 18:41:36 -07:00
0b96a0e80c
BUILDFIX: corrected template parameter for LL_BAD_TEMPLATE_INSTANTIATION macro in llunit
2013-08-26 18:37:07 -07:00
e1c09b9b59
fixed eol type
2013-08-26 18:21:19 -07:00
1f3f660cf4
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
2013-08-26 18:17:26 -07:00
8535b87544
removed some unecessary template parameters from LLUnit member functions
...
forced unit conversion code to inline
unit conversion now no longer converts all the way to base and back, but tries
to find equivalent units as early as possible
fixed another llinfos instance
scene monitor now outputs n/a for invalid samples
2013-08-26 18:00:24 -07:00
662d6a1771
added compile time warnings to use of deprecated llinfos, llwarns, etc.
2013-08-26 10:51:08 -07:00
041ab1c46c
reversion of rendering starts late change
2013-08-26 11:33:37 -06:00
74d4933ab7
reversion of object cache version number change
2013-08-26 11:32:58 -06:00
cb8c94cc88
updated appearance utility source
2013-08-23 16:27:39 -07:00
0d1850ef0b
updated appearance utility source
2013-08-23 15:53:18 -07:00
e30b03198c
Automated merge with https://bitbucket.org/lindenlab/viewer-interesting
2013-08-23 15:35:45 -07:00
b667d20e00
fixed issue with poor framerate after clearing cache
2013-08-23 15:34:41 -07:00
4c7f489629
BUILDFIX: replaced function that was accidentally removed
2013-08-23 15:02:37 -07:00
235cc39293
BUILDFIX: reverted some debugging changes to llerror.cpp
2013-08-23 14:22:01 -07:00
d058447aaa
merge
2013-08-23 13:42:29 -07:00
a77f424945
BUILDFIX: fix for crashes in unit tests on mac and linux
2013-08-23 13:41:51 -07:00
Xiaohong Bao