bcba6ee3a5
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
2013-10-24 20:50:08 -06:00
bd8f98ff3d
add throttle to number of pokes to potential visible objects per frame.
2013-10-24 19:48:44 -06:00
d98b6a932d
fix a flaw LLViewerOctreeEntry::mVisible not initialized.
2013-10-24 19:46:09 -06:00
371198289b
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
2013-10-24 14:42:00 -07:00
d13f26a6fc
Merge
2013-10-24 14:39:19 -07:00
dc60a7564a
SH-4577 WIP Interesting: viewer crashed when clicking a offline Conversation containing a shared object
...
potential fix by making instance tracker allow key collisions for LLToastNotifyPanel
changed assertion macro to use original unpreprocessed source code
renamed instance tracker behavior macros to use LL prefix
added RestoreCameraPosOnLogin setting to optionally restore old camera positioning behavior
2013-10-24 14:37:57 -07:00
066182bf06
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
2013-10-23 15:45:48 -06:00
806cd01a0d
fix for SH-4551: Interesting: some attachments do not appear after teleport
2013-10-23 15:45:15 -06:00
ab43be5ddb
moved some common functionality from LLTrace::BlockTimerStatHandle to BlockTimer
...
updates appearance utility dependency
2013-10-23 13:24:47 -07:00
e06ad3d60f
updated appearance utility dependency
2013-10-23 09:49:29 -07:00
4264060662
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
2013-10-22 16:08:16 -06:00
e0ace6d869
fix for various object missing bugs: SH-4552, SH-4564, SH-4573, SH-4568
2013-10-22 16:07:41 -06:00
e46c4fd1c6
trivial: convert to unix endings.
2013-10-22 15:47:50 -06:00
0c60e32808
Merge
2013-10-21 16:57:38 -06:00
f4283778dd
fix for crash when copying trace recording
2013-10-21 14:50:53 -07:00
1dfba44b3d
fixed things so that trace recordings can be read from even while active
2013-10-21 14:22:21 -07:00
54c9aba3d9
more buildfix
2013-10-21 12:54:21 -07:00
04397a095a
more buildfix
2013-10-21 12:29:33 -07:00
fcf5602ba8
more buildfix
2013-10-21 11:56:31 -07:00
318a1eca57
more buildfix stuff
2013-10-21 11:24:35 -07:00
30863e0af0
another attempted buildfix
2013-10-21 11:19:38 -07:00
aef2a527e5
BUILDFIX: double delete in instancetracker unit test
2013-10-21 10:32:19 -07:00
fc45b59a97
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
2013-10-18 16:15:05 -06:00
7bfacf8ca6
stop other cameras than the world camera to asscee object cache.
2013-10-18 16:14:40 -06:00
d2cf7ba429
more forgotten typenames
2013-10-18 13:34:25 -07:00
99e29b8340
crash fix - bad handling of instancetracker iterators
2013-10-18 13:10:40 -07:00
8b93238b42
BUILDFIX: forgot typename
2013-10-18 10:04:29 -07:00
4170ef8ecc
fixed llinstancetracker unit test
2013-10-18 09:50:26 -07:00
9f097380b8
removed asserts in order to get testable builds again
...
added unpause() behavior and changed pause() to do nothing when already stopped
2013-10-18 09:14:53 -07:00
cf89975f16
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
2013-10-17 20:22:02 -06:00
c8228b65f8
fix for SH-4569: Objects are not culled by size in the distance
2013-10-17 20:21:17 -06:00
18aedf0241
fix for assert at runtime (reading stats from recording while it was active)
...
fix for bad values returns from getPeriodMin and getPeriodMax on count stats when no counts recorded
fix for gcc compile time error (typename ftw)
2013-10-17 19:18:53 -07:00
ec17869024
BUILDFIX: bad typedef
2013-10-17 14:48:01 -07:00
92c4677a84
Automated merge with bundle:c:\code\viewer-interesting+c:\users\richard\appdata\local\temp\thg._vi9rd\http__bitbucket.org_lindenlab_viewer-interesting_s1et2g.hg
2013-10-17 14:28:08 -07:00
1beaedacad
moved root timer to global variable
...
added flag to LLInstanceTracker to allow multiple values per key
made StatType allow multiple values per key to eliminate block timer related crash
2013-10-17 14:23:56 -07:00
2b4dfefda2
more fix for SH-4552: Interesting: objects sometimes fail to load after teleport.
2013-10-16 20:59:13 -06:00
816c86a3cb
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
2013-10-16 20:07:00 -06:00
82c93b52c5
fix for SH-4552: Interesting: objects sometimes fail to load after teleport.
2013-10-16 20:06:21 -06:00
1c26d42656
moved tree iterators into llfasttimer.h
2013-10-16 16:42:27 -07:00
c7057c141c
increment viewer version to 3.6.9
2013-10-16 17:16:25 -04:00
9ca1358d42
Added tag 3.6.8-release for changeset d40c66e41074
2013-10-16 17:14:18 -04:00
697d2e720b
renamed TimeBlock to BlockTimerStatHandle
2013-10-15 20:24:42 -07:00
8f82b0016e
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
2013-10-15 15:19:41 -07:00
2270647009
added params for project interesting
2013-10-15 15:19:35 -07:00
4755ccf269
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
2013-10-15 14:05:05 -06:00
6a06619777
fix for SH-4551: Interesting: some attachments do not appear after teleport
2013-10-15 14:03:59 -06:00
45f93f5fbb
add cached object count stat
2013-10-15 10:19:52 -07:00
1acceb3633
changed ll_aligned_(malloc|free) to take alignment size as a template argument
2013-10-14 10:18:41 -07:00
929311869b
MAINT-2968 Transplant cleanup.
2013-10-11 17:10:26 -05:00
a6a40bd69f
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
2013-10-11 10:42:44 -07:00
Xiaohong Bao