d5041f5fb0
fix for SH-1691: [crashhunters] crash at LLVolumeImplFlexible::doFlexibleUpdate() [secondlife-bin llflexibleobject.cpp]
2011-06-02 12:05:45 -06:00
87512a6e5d
re-applying fix from previous mesh-dev merge branch
...
SH-1062 FIX Flexi sculpts is a mess until you zoom in.
2011-04-20 18:22:02 -04:00
019585ed6c
SH-959 FIX crash in llflexibleobject.cpp
...
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
2011-02-17 13:52:58 -05:00
3084bd5209
Only force an update if a flexible object is visible.
2010-10-28 17:40:01 -05:00
a5619d16f7
correct licenses (fix problem with license change merge)
2010-10-13 07:24:37 -04:00
3dff1e8e6f
Fix for crash when updating flexis.
2010-09-28 13:53:09 -05:00
7c2b9221d6
merge
2010-09-27 15:20:27 -05:00
90e3d83a5c
Fix for build failures - disabling tcmalloc for now
2010-09-21 13:26:52 -04: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
26ba00b555
Vectorized octree and much of llspatialpartition and lldrawable.
...
Octree driven raycast.
2010-06-03 12:52:28 -05: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
f2e202e6a4
CID-368
...
Checker: UNINIT_CTOR
Function: LLVolumeImplFlexible::LLVolumeImplFlexible(LLViewerObject *, LLFlexibleObjectData *)
File: /indra/newview/llflexibleobject.cpp
2010-01-27 16:43:48 -08:00
801301c435
fix DEV-41913: parcel media does not display on particle textures.
2009-10-30 21:22:47 -06:00
138bf11322
merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3
...
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-08-24 20:04:52 +00:00
77f56a3f3d
merge QAR-1579: texture-cleanup-1.
2009-07-10 22:02:26 +00:00
e3cf284388
Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
2009-01-08 00:05:06 +00:00
ad33281007
QAR-650 - Viewer RC 9 merge -> release (post cmake)
...
merge release@88802 Branch_1-20-Viewer-2-merge-1@89178 -> release
2008-06-06 22:43:38 +00:00
16baf6c9d4
merge release-QAR-499 Viewer 1.20 RC 3
...
merge release-QAR-508 Viewer 1.20 RC 4
merge Branch_1-20-Viewer -r 85278 : 85828 -> release
2008-04-28 23:29:46 +00:00
dc48f1c741
svn merge -r83872:83893 linden/branches/Branch_1-20-0-Server to linden/release
...
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-03 22:50:22 +00:00
941cb9f412
merge release@83343 skinning-1-merge@83714 -> release
...
QAR-424
2008-04-01 17:45:04 +00:00
6d52efe452
Merge of windlight into release (QAR-286). This includes all changes in
...
windlight14 which have passed QA (up through r79932).
svn merge -r 80831:80833 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge_windlight14_r80620
2008-02-27 18:58:14 +00:00
5595a99623
Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.
2007-10-04 23:19:43 +00:00
ce0a5fe145
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
...
Actual action: branched maintenance-r68118, merged in release, then copied result into release
2007-08-21 22:17:53 +00:00
e5124431b5
svn merge -r 64079:64548 svn+ssh://svn/svn/linden/branches/maintenance into release
2007-07-02 17:10:30 +00:00
e03bb0606a
merge -r62831:64079 branches/maintenance to release
2007-06-21 22:40:22 +00:00
3e9872a297
merge -r61423:62602 svn/branches/maintenance --> release
2007-05-30 17:39:09 +00:00
aa96d1fddf
merge -r 59337:59951 Branch_1-14-0 -> release.
2007-04-03 00:16:59 +00:00
b36dc36306
svn merge -r 58902:58986 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
2007-03-09 01:09:20 +00:00
4dabd9c047
merge release@58699 beta-1-14-0@58707 -> release
2007-03-02 21:25:50 +00:00
7f50e28b0f
merge -r 56842:57026 maintenance.
2007-01-23 19:12:31 +00:00
420b91db29
Print done when done.
2007-01-02 08:33:20 +00:00
Xiaohong Bao