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
a2a6bf20d7
merge with release
2013-06-20 16:46:23 -07:00
7d88994edc
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
2013-06-19 11:46:51 -06:00
c5fc8f9006
SH-4246 FIX interesting: fast timers significantly decreases framerate
...
moved collapsed flag to fast timer tree node
2013-06-19 08:23:53 -07:00
9ed2f4d3cb
add a debug setting "InvisibleObjectsInMemoryTime" to adjust the time invisible objects stay in memory.
2013-06-17 15:24:15 -06:00
fc88265cff
fix for SH-4241: viewer crash shortly after login in LLViewerRegion::addNewObject and
...
SH-4261: interesting: crash in LLViewerRegion::addToVOCacheTree
2013-06-13 18:47:51 -06:00
427490edb5
possible fix and new debug code for SH-4241: viewer crash shortly after login in LLViewerRegion::addNewObject
2013-06-10 22:43:29 -06:00
0a96b47663
merge with viewer-release
2013-06-05 19:05:43 -07:00
6827febd30
change the way to handle creating/destroying a same object repeatedly
2013-05-28 14:55:37 -06:00
774544bc51
Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting
2013-05-23 18:26:14 -06:00
16616ae48d
for SH-4145: Interesting: Implement occlusion culling for object cache
2013-05-23 18:25:21 -06:00
b9bb95f8ae
MAINT-2647 Fix for some objects not rendering until first LoD switch/selection.
2013-05-09 15:40:02 -05:00
6b81b8629e
Spring cleaning: removed unused .cpp and.h files, and cleaned up header dependencies
2013-05-05 17:45:35 -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
fd447189c5
Merge 3.5.1 into Materials
2013-04-25 21:00:16 -07:00
ddd5659f81
merge changes for DRTVWR-294
2013-04-19 10:11:29 -04:00
509c35d5ba
NORSPEC-90 Cleanup avatar alpha shaders
2013-04-18 19:21:08 -05:00
2fde4a9ae5
merge changes for 3.5.0-beta7
2013-04-01 14:24:01 -04: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
8de397b19e
SH-3931 WIP Interesting: Add graphs to visualize scene load metrics
...
changed LLCriticalDamp to LLSmoothInterpolation and sped up interpolator lookup
improvements to stats display of llstatbar
added scene load stats floater accessed with ctrl|shift|2
2013-03-18 08:43:03 -07:00
8e3b190e91
merge
2013-03-11 15:17:13 -04:00
207d9fd767
Viewer-chui merge
2013-03-11 14:45:53 -04: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
2ea750ebca
For MAINT-2247 MAINT-1742 MAINT-2275 contrib from STORM-1934.
2013-03-05 13:47:02 -08:00
f352c81f11
For MAINT-2423 fix regression from CHUI merge. Code review: DaveP
2013-03-04 14:18:49 -08:00
11d12f1a99
Merge from viewer-beta
2013-02-13 11:30:36 -05:00
2bcfc9554d
remove obsolete LLMemType tracing from materials
2013-02-12 14:38:47 -05:00
8bb3d0891d
merge up to 3.4.5-release
2013-02-12 13:27:03 -05:00
faae38daaa
Pull merge from lindenlab/viewer-developement
2013-01-30 20:01:03 -08:00
5f03e197f4
Trying to set materials up for rendering! Yay!
2013-01-25 17:54:38 -05:00
4d589df2fd
MAINT-2275 Child prims are "left behind" by animated, moving (physical) linksets
...
* A fix that doesn't break tanks. Reverts MAINT-1742
2013-01-24 15:32:36 -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
aee0766f35
MAINT-2275 Child prims are "left behind" by animated, moving (physical) linksets
...
* A fix that doesn't break doors. Reverst MAINT-2247
2013-01-24 13:21:45 -08:00
27e13e7330
MAINT-2275 Child prims are "left behind" by animated, moving (physical) linksets
2013-01-24 09:17:02 -08:00
7ecfa28c43
MAINT-2247 Child object does not update rotation while selected.
2013-01-16 15:21:11 -08:00
7cc37d949e
fix the merge errors from the changeset 3eadda9666cf
2013-01-09 22:43:10 -07:00
8315e97453
Merge
2013-01-08 14:50:31 -07: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
4e22f3e3ef
fix for SH-3624: Object deletion does not work
2012-12-18 23:16:50 -07:00
e1247d631f
fix for SH-3619: some objects are missing
2012-12-18 14:36:46 -07: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
0820124bee
MAINT-1950 Fix for offscreen objects not getting rebuilt sometimes.
2012-11-21 16:15:35 -06:00
c0224cc47a
merge with viewer-development
2012-11-19 19:06:36 -08:00
c9044c03b3
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.
2012-11-09 18:51:23 -08:00
c2859e4663
for SH-3472: prioritize object loading
2012-11-08 21:36:47 -07:00
ccad8c9411
Automated merge with http://bitbucket.org/lindenlab/viewer-lion
2012-11-08 14:23:34 -06:00
c431ddf629
Automated merge with http://bitbucket.org/lindenlab/viewer-development
2012-11-08 13:05:29 -06:00
9da9b2d84b
Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui/.
2012-10-17 14:32:29 -07:00
9d701e563b
MAINT-1742 Child object does not update position while selected.
...
reviewed with Davep
2012-10-17 14:05:14 -07:00
8f9da8b37d
Pull and merge from https://bitbucket.org/lindenlab/viewer-development .
2012-10-16 15:19:31 -07:00
c0ba626c80
For SH-3333: Design and implement a new object cache system on viewer side
2012-10-15 21:34:29 -06:00
d6e3b0445a
Merge in viewer-development code and fix build
2012-10-15 14:23:29 -07:00
1709952adb
pull back 3.4.1-beta6 fixes
2012-10-10 21:40:10 -04:00
c06c35609c
Updating linux build to gcc4.6
2012-10-11 00:09:04 +00:00
830ecff00b
DRTVWR-225 Cleanup assertions
2012-10-10 14:13:52 -05:00
4a3bdb6896
Pull and merge from ssh://hg@bitbucket.org/oz_linden/viewer-beta-drtvwr-179.
2012-10-10 15:10:48 -07:00
bc0abc7734
Fix up some assertions in lloctree.h
2012-10-02 12:11:42 -05:00
b5e71964e5
reapply c77cea5c6e41: MAINT-646 Cleanup some warnings from previous changes.
2012-09-20 10:00:56 -04:00
683c43c2e0
reapply 448b02f5b56f: MAINT-1147 Fix for frame stall on region crossing.
2012-09-20 10:00:55 -04:00
cf98064700
reapply 52b6c9168974: MAINT-646 Factor std::set out of lloctree
2012-09-20 09:48:55 -04:00
4ddd796875
MAINT-1456,MAINT-1519,PATH-879: BUGFIX Correcting behavior for objects moved by scripts so that the drawable is properly updated with the updated location.
2012-09-12 18:08:45 -07:00
a766e26db4
Backing out the changes contributing to DRTVWR-167 and DRTVWR-179 from the repository.
2012-09-10 10:37:02 -07:00
de1d297dea
MAINT-1503 Disable tcmalloc and fix remaining alignment issues.
2012-08-31 14:11:46 -05:00
4a5ad35793
MAINT-570 Remove unused memory tracking system LLMemType
2012-07-20 11:42:15 -05:00
3803a5b5ae
pull back fixes for 3.3.4-beta4
2012-07-17 13:21:36 -04:00
ccac47c1a7
MAINT-1223 Fix for alpha updates not triggering LoD updates.
2012-07-16 14:31:15 -05:00
c0e2d4d988
MAINT-794 Fix for assert on loading some types of objects before their parents.
2012-07-11 15:14:13 -05:00
fd578f1136
MAINT-654 Potential fix for corrupt avatar bakes on some AMD systems.
2012-06-26 15:44:02 -05:00
029103133e
MAINT-794 Factor out a lot of CPU overhead around updating objects.
2012-06-19 18:08:39 -05:00
93fcff2b24
MAINT-646 Cleanup some warnings from previous changes.
2012-06-14 14:54:54 -05:00
b93a23aa82
MAINT-1147 Fix for frame stall on region crossing.
2012-06-13 18:05:56 -05:00
92ee373e45
MAINT-646 Factor std::set out of lloctree
2012-06-05 12:55:17 -05:00
71bbb384b0
MAINT-753 : [crashhunters] crash at LLVOVolume::updateFaceFlags(). Null pointer checks are good.
...
Reviewed by Kelly
2012-05-07 13:24:52 -07:00
7a20b5be78
MAINT-775, MAINT-1022 Regression cleanup.
2012-05-01 15:33:16 -05:00
5ef21ba6c5
MAINT-775 More edge case cleanup -- spinning child prims still break on deselect until the next LoD update
2012-04-20 00:58:55 -05:00
d953cce386
MAINT-775 Cleanup of some weird corner cases on animated child prims.
2012-04-19 17:29:32 -05:00
5334c410ea
MAINT-775 Don't thrash vertex buffers on animated prims (flexis, spinners, etc).
2012-04-19 14:16:49 -05:00
18e7f1bffd
SH-2889 Add visual auto-muting controls
2012-01-20 16:42:57 -06:00
13de92740e
merge latest viewer-development
2011-06-22 11:45:43 -04:00
53e890f4fd
SH-1359 General octree tune-up -- increase maximum capacity of an octree node and rework requested octree node sizes for minimum triangles per frame and maximum triangles per drawing call.
2011-05-26 20:37:15 -05:00
0eb13bb682
storm-1189: remove more of the code for classic clouds
2011-05-26 11:30:39 -04:00
3a409e6edc
SH-1603 Replace every occurrence of "WTF" with something more appropriate.
2011-05-25 18:45:21 -05:00
b89af09f59
SH-998 Fix for improper LoD when an object is first rezzed.
2011-03-04 14:25:46 -06:00
162d467b4a
SH-1085 Fix for crash when unchecking "mirror." Basically got LLFace to be paranoid about who gets to touch its LLVertexBuffer members.
...
Reviewed by Nyx.
2011-03-03 16:14:52 -06:00
e55e91a5a5
SH-874 Better VBO usage hints, most notably don't use VBOs for occlusion queries if GL is set to not use VBOs for stream draw.
2011-02-22 18:36:50 -06:00
bb113f75ef
SH-900 Fix for only lowest LoD appearing for objects in neighboring regions.
2011-02-02 19:01:27 -06:00
32c4a448b1
SH-571 Fix for shadows disappearing for a frame whenever an object switches octree nodes. Regressed EXT-7155 so fix for regression included.
2011-01-19 23:16:53 -06:00
892d70f5d5
Prune ll_aligned_malloc/free calls out of lldrawable and llface
2010-11-21 03:48:11 -06:00
225ffbba20
Automated merge up from viewer-development
2010-10-27 15:08:21 -04:00
a5619d16f7
correct licenses (fix problem with license change merge)
2010-10-13 07:24:37 -04:00
c7b6ebaf76
Port of SNOW-643 : Water flicker at high altitude. This doesn't fix the low altitude flicker though (STORM-306)
2010-09-30 22:57:05 -07:00
569f3f4b06
Merge
2010-09-22 13:04:53 -07:00
90e3d83a5c
Fix for build failures - disabling tcmalloc for now
2010-09-21 13:26:52 -04:00
c42ed54b0a
Stop using ll_aligned_malloc/free in llvolume.
...
Fix for garbage data in vertex weight array crashing software skinning.
Proper integration of picking for rigged attachhments.
Optimization in LLDrawable::updateDistance (don't call updateRelativeXform, just use spatial group position).
2010-09-20 18:45:56 -05:00
90da6d6fdc
Raycasting for rigged attachments now works for your own attachments while in edit mode.
2010-09-19 23:07:15 -05:00
e416840f85
Backed out changeset c3d41f18ce2b
...
back-out the back-out for this branch. yay.
2010-08-24 19:22:00 +01:00
98cc236503
Backed out changeset a62bf7c0af21
...
Backing out this merge that I pushed (prematurely) to the wrong place.
2010-08-24 18:44:39 +01:00
Richard Linden