ee2fce8790
Merge downstream code and viewer-beta
2013-05-09 14:10:45 -07:00
ddd5659f81
merge changes for DRTVWR-294
2013-04-19 10:11:29 -04:00
6742d90d39
Some minor cleanups while hunting crashes. Reviewed by Kelly
2013-04-17 11:17:46 -07:00
b42b789723
Merge in downstream code (chui fixes, materials)
2013-04-11 16:18:34 -07:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
d5561a1ada
Merge in viewer-beta to get CHUI code
2013-03-19 16:20:53 -07:00
207d9fd767
Viewer-chui merge
2013-03-11 14:45:53 -04:00
f8e059deee
MAINT-2371 Lat round of optimizations.
...
Reviewed by Graham
2013-03-08 17:11:30 -06:00
faae38daaa
Pull merge from lindenlab/viewer-developement
2013-01-30 20:01:03 -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
573ab07a40
Merge pull from lindenlab/viewer-beta
2013-01-10 14:51:59 -08:00
138d4f5fcd
Updating a comment.
2012-12-17 16:15:28 -08:00
40e78a80cc
Pull and merge viewer-development
2012-12-04 14:31:15 -08: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
5d34ac552f
Automated merge with https://bitbucket.org/lindenlab/viewer-development
2012-11-20 17:03:55 -06:00
18e20ca6f2
MAINT-1270 Fix for flexi prims showing up as discs when first loading.
...
Reviewed by Stinson.
2012-11-20 16:50:23 -06:00
8db983fb80
MAINT-1270 Fix for flexi prims showing up as discs when first loading.
...
Reviewed by Stinson.
2012-11-20 16:50:23 -06:00
6036ee9c42
MAINT-1890 FIX Removing previous hacky fix for this issue. The better solution is to clamp the update_period to a reasonable number of frames (32).
2012-11-16 17:26:01 -08:00
ad84656016
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.
2012-11-14 11:20:29 -08:00
951b4c3efb
MAINT-1890: Adding a more descriptive comment to this hack fix for future reference.
2012-11-13 15:23:15 -08:00
c137b645b6
MAINT-1890: A hacky fix for flexi-prim updates after teleport by ignoring the sUpdateDelay value and simply updating all flexi-prims. This change most likely reduces frame rate.
2012-11-12 19:35:34 -08:00
93995ada05
MAINT-1894: FIX This *should* fix a crash in the LLVolume::resizePath() 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-11-12 15:27:56 -08:00
c06c35609c
Updating linux build to gcc4.6
2012-10-11 00:09:04 +00:00
d1481a599f
MAINT-1486 FIXED Crash on login (Unhandled exception)
2012-08-31 00:38:16 +03:00
6d84272d38
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.
2012-08-23 15:11:10 -07:00
1e0470ac56
correct merge error
2012-08-14 12:41:48 -04:00
24c1b62e27
merge back beta fixes
2012-08-14 09:01:56 -04:00
92a0db2a4f
Merge MAINT-1270 fix
2012-08-01 13:17:35 -07:00
e3c5cf99f1
MAINT-1270 Fix for some flexi prims becoming flat at some LoDs
2012-07-16 17:27:52 -05:00
407d227e25
MAINT-1270 Fix for some flexi prims becoming flat at some LoDs
2012-07-16 17:27:52 -05:00
7929db82d1
MAINT-794 Move flexi idleUpdate and texture animation to their own update queues.
2012-06-20 18:29:18 -05:00
029103133e
MAINT-794 Factor out a lot of CPU overhead around updating objects.
2012-06-19 18:08:39 -05:00
0e0e3a4929
MAINT-646 Optimize LLVolumeImplFlexible::doIdleUpdate()
2012-06-08 14:20:22 -05:00
7a20b5be78
MAINT-775, MAINT-1022 Regression cleanup.
2012-05-01 15:33:16 -05:00
5334c410ea
MAINT-775 Don't thrash vertex buffers on animated prims (flexis, spinners, etc).
2012-04-19 14:16:49 -05:00
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
simon