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
6ba23344c9
merge heads. whew.
2010-08-24 18:37:53 +01:00
2fea1d5d33
Integrate SIMD API from oreh/server-trunk-oreh
2010-08-19 12:25:15 -05:00
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
13202e744c
merge
2010-07-14 11:11:31 -05:00
a6cf0bed74
Merge from ssh://hg.lindenlab.com/dessie/viewer-release
2010-06-21 11:24:33 -07:00
b088449517
Merge from ssh://hg.lindenlab.com/dessie/viewer-release
2010-06-21 11:24:33 -07:00
463c0ad32b
EXT-7446 Spatial Partition Crash
2010-06-18 12:57:56 -05:00
83aed5b6b7
fix new macro usage.
2010-06-04 09:26:23 +01:00
f40d07512a
finish conversion to ll_aligned_*() wrappers
2010-06-04 09:04:36 +01:00
26ba00b555
Vectorized octree and much of llspatialpartition and lldrawable.
...
Octree driven raycast.
2010-06-03 12:52:28 -05:00
ea5e4e7c74
Fix for ridiculous bug that causes all sitting avatars to rebuild their geometry every frame.
...
(transplanted from dd9dfa0c1629b21268f91ae0e46a51ca9d29f861)
2010-04-19 23:31:38 -05:00
1f4a4d6255
Fix for ridiculous bug that causes all sitting avatars to rebuild their geometry every frame.
...
(transplanted from dd9dfa0c1629b21268f91ae0e46a51ca9d29f861)
2010-04-19 23:31:38 -05:00
8b88b093b9
Fix for ridiculous bug that causes all sitting avatars to rebuild their geometry every frame.
2010-04-19 23:31:38 -05:00
44cfa948c7
merge.
2010-02-11 11:19:51 +00:00
eeb4800858
CID-130
...
Checker: NULL_RETURNS
Function: LLSpatialBridge::LLSpatialBridge(LLDrawable *, int, unsigned int)
File: /indra/newview/lldrawable.cpp
2010-02-10 18:43:13 +00:00
b7b2d2b3ee
CID-152
...
Checker: NULL_RETURNS
Function: LLSpatialBridge::updateMove()
File: /indra/newview/lldrawable.cpp
2010-02-10 18:31:34 +00:00
6d4b4762d1
merge
2010-02-09 11:23:33 -06:00
c52ed438fb
Remove some fast timers that were being futzy.
2010-03-05 10:49:05 -06:00
eb5b0f2542
Optimiziation pass.
...
Added RenderUseStreamVBO to enable/disable usage of VBO's for streaming buffers.
Faster traversal of LLCullResult members.
Removal of llpushcallstacks from inner loops.
Sprinkling in fast timers.
2010-03-04 15:30:15 -06:00
60dde53d72
Remove some fast timers that were being futzy.
2010-03-05 10:49:05 -06:00
4ffac61994
Optimiziation pass.
...
Added RenderUseStreamVBO to enable/disable usage of VBO's for streaming buffers.
Faster traversal of LLCullResult members.
Removal of llpushcallstacks from inner loops.
Sprinkling in fast timers.
2010-03-04 15:30:15 -06:00
0980df1e0c
merge
2010-02-23 17:07:18 -08:00
da79eb5545
Turning on Davep optimizations again. Backed out changeset d89b00b44ab6
2010-02-23 16:48:49 -08:00
3b8463f0fd
merge
2010-02-12 21:06:25 -08:00
1f672990e7
Backed out davep's optimization pass. changeset 3c3685de430a
2010-02-12 21:06:02 -08:00
418504207b
merge
2010-02-12 15:16:19 -08:00
8e67ecf3dc
Optimization pass.
...
-- Further instrumentation of idle update
-- Removed mActiveQ from LLPipeline, instead making calm objects static during LLVOVolume::idleUpdate
-- Further instrumentation of flexible object update
-- Converted LLDynamicArray and LLMap members of LLViewerObjectList to stl counterparts
-- Increased number of update bins in LLViewerObjectList from 16 to 128 (objects will be processed every 128 frames instead of every 16, or ~ 90% fewer objects processed per frame)
-- Removed unused "renderObjectsForSelect" code.
-- Reenabled LOD updates for objects further than 24m from camera
2010-02-03 12:33:32 -06:00
Graham Madarasz (Graham)