summaryrefslogtreecommitdiff
path: root/indra/newview/llflexibleobject.cpp
AgeCommit message (Collapse)Author
2013-04-30Merge 3.5.1 into MaterialsGraham Madarasz
2013-01-30Pull merge from lindenlab/viewer-developementMerov Linden
2013-01-10Merge pull from lindenlab/viewer-betaMerov Linden
2012-12-17Updating a comment.William Todd Stinson
2012-12-04Pull and merge viewer-developmentsimon@Simon-PC.lindenlab.com
2012-11-20MAINT-1270 Fix for flexi prims showing up as discs when first loading.Dave Parks
Reviewed by Stinson.
2012-11-16MAINT-1890 FIX Removing previous hacky fix for this issue. The better ↵William Todd Stinson
solution is to clamp the update_period to a reasonable number of frames (32).
2012-11-14Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.William Todd Stinson
2012-11-13MAINT-1890: Adding a more descriptive comment to this hack fix for future ↵William Todd Stinson
reference.
2012-11-12MAINT-1890: A hacky fix for flexi-prim updates after teleport by ignoring ↵William Todd Stinson
the sUpdateDelay value and simply updating all flexi-prims. This change most likely reduces frame rate.
2012-11-12MAINT-1894: FIX This *should* fix a crash in the LLVolume::resizePath() ↵William Todd Stinson
method. The callstacks indicated that the std library was throwing a length exception on the std::vector::resize() call. Most likely cause was that the recent changes for flexi-prims were causing the mRenderRes to become negative. And thus, the 1<<mRenderRes calculation was generating a really large value for num_render_sections.
2012-08-31MAINT-1486 FIXED Crash on login (Unhandled exception)MaksymS ProductEngine
2012-08-23Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.Todd Stinson
2012-08-14correct merge errorOz Linden
2012-08-14merge back beta fixesOz Linden
2012-08-01Merge MAINT-1270 fixsimon@Simon-PC.lindenlab.com
2012-07-16MAINT-1270 Fix for some flexi prims becoming flat at some LoDsDave Parks
2012-07-16MAINT-1270 Fix for some flexi prims becoming flat at some LoDsDave Parks
2012-06-20MAINT-794 Move flexi idleUpdate and texture animation to their own update ↵Dave Parks
queues.
2012-06-19MAINT-794 Factor out a lot of CPU overhead around updating objects.Dave Parks
2012-06-08MAINT-646 Optimize LLVolumeImplFlexible::doIdleUpdate()Dave Parks
2012-05-01MAINT-775, MAINT-1022 Regression cleanup.Dave Parks
2012-04-19MAINT-775 Don't thrash vertex buffers on animated prims (flexis, spinners, etc).Dave Parks
2011-06-02fix for SH-1691: [crashhunters] crash at ↵Xiaohong Bao
LLVolumeImplFlexible::doFlexibleUpdate() [secondlife-bin llflexibleobject.cpp]
2011-04-20re-applying fix from previous mesh-dev merge branchNyx (Neal Orman)
SH-1062 FIX Flexi sculpts is a mess until you zoom in.
2011-02-17SH-959 FIX crash in llflexibleobject.cppNyx (Neal Orman)
Crash was a result of one of two possibilities: 1) trying to update geometry when it wasn't visible 2) mSimulateRes was non-zero when mInitialized was 0 Put code to handle both cases - initialize if mSimulateRes is 0 OR mInitialized is 0 But only do so if the object is visible. If the object is not visible, early out. Code reviewed by davep
2010-10-28Only force an update if a flexible object is visible.Dave Parks
2010-10-13correct licenses (fix problem with license change merge)Oz Linden
2010-09-28Fix for crash when updating flexis.Dave Parks
2010-09-27mergeDave Parks
2010-09-21Fix for build failures - disabling tcmalloc for nowBrad Payne (Vir Linden)
2010-08-19Integrate SIMD API from oreh/server-trunk-orehDave Parks
2010-08-13Change license from GPL to LGPL (version 2.1)Oz Linden
2010-06-03Vectorized octree and much of llspatialpartition and lldrawable.Dave Parks
Octree driven raycast.
2010-02-03Optimization pass.Dave Parks
-- 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-01-27CID-368Tofu Linden
Checker: UNINIT_CTOR Function: LLVolumeImplFlexible::LLVolumeImplFlexible(LLViewerObject *, LLFlexibleObjectData *) File: /indra/newview/llflexibleobject.cpp
2009-10-30fix DEV-41913: parcel media does not display on particle textures.Xiaohong Bao
2009-08-24merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3Richard Nelson
DEV-11254 DEV-11254 DEV-2003: DEV-21567 DEV-37301 EXT-104 EXT-138 EXT-217 EXT-256 EXT-259 EXT-259 EXT-328 EXT-348 EXT-386 EXT-399 EXT-403 EXT-460 EXT-492 EXT-492 EXT-531 EXT-537 EXT-684 improved text editor (handles multiple fonts simultaneously as well as inline widgets)
2009-07-10merge QAR-1579: texture-cleanup-1.Xiaohong Bao
2009-01-08Result of svn merge -r107256:107258 ↵Aaron Brashears
svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
2008-06-06QAR-650 - Viewer RC 9 merge -> release (post cmake)Steven Bennetts
merge release@88802 Branch_1-20-Viewer-2-merge-1@89178 -> release
2008-04-28merge release-QAR-499 Viewer 1.20 RC 3Steven Bennetts
merge release-QAR-508 Viewer 1.20 RC 4 merge Branch_1-20-Viewer -r 85278 : 85828 -> release
2008-04-03svn merge -r83872:83893 linden/branches/Branch_1-20-0-Server to linden/releaseKelly Washington
HAVOK4 IN TEH HOUSE!!11!!ONE!! If it is broken blame Joel for not fixing the loginassetdatabaseinventorygroupIM server instead of working on this. QAR-448
2008-04-01merge release@83343 skinning-1-merge@83714 -> releaseSteven Bennetts
QAR-424
2008-02-27Merge of windlight into release (QAR-286). This includes all changes inBrad Kittenbrink
windlight14 which have passed QA (up through r79932). svn merge -r 80831:80833 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge_windlight14_r80620
2007-10-04Result of svn merge -r71162:71205 ↵Aaron Brashears
svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.
2007-08-21EFFECTIVE MERGE: svn merge -r 66133:68118 ↵Christian Goetze
svn+ssh://svn/svn/linden/branches/maintenance into release Actual action: branched maintenance-r68118, merged in release, then copied result into release
2007-07-02svn merge -r 64079:64548 svn+ssh://svn/svn/linden/branches/maintenance into ↵Don Kjer
release
2007-06-21merge -r62831:64079 branches/maintenance to releaseKelly Washington
2007-05-30merge -r61423:62602 svn/branches/maintenance --> releaseKelly Washington