c6a2ac0489
Pull and merge from ssh://hg@bitbucket.org/stinson_linden/viewer-beta-drtvwr-179.
2012-09-20 19:43:54 -07:00
55e1557b8a
reapply 668dcacd6e76: MAINT-646 Vectorize LLPolyMesh
2012-09-20 09:54:49 -04:00
97d969a338
initial attempt to restore changes that make removing tcmalloc possible; not tested
2012-09-12 14:36:37 -04:00
a766e26db4
Backing out the changes contributing to DRTVWR-167 and DRTVWR-179 from the repository.
2012-09-10 10:37:02 -07:00
173d0fa213
Pull in viewer-development because it's painful. Merge with runitai's help.
2012-07-11 16:15:23 -07:00
575aa87300
MAINT-646 Vectorize LLPolyMesh
2012-06-06 17:16:16 -05:00
c8682722ad
SH-2789 WIP - aligned alloc and realloc
2011-12-21 17:02:47 -05:00
2a843e9a6b
Fix up alignment problems for debug build.
...
reviewed by davep.
2011-05-12 16:09:42 -07:00
12f9f521ee
Fix for bad default setting and libpng using /GL
2011-04-13 13:43:32 -05:00
13e12b2773
Fix for bad merge causing crash in llpolymorph.cpp
2011-04-12 17:22:02 -05:00
f17997e274
merge cleanup
2011-04-06 16:21:40 -05:00
47781184fc
Automated merge up from viewer-development into mesh-development
2011-04-04 10:42:52 -04:00
62ebe50a56
Added duplicate morph to handle breast bounce/clap. Took out unused params in llphysicsmotion.cpp.
2011-04-03 21:16:34 -04:00
01c236df47
Fix for butt gravity direction.
...
Added more displacement range for butt leftright.
2011-04-03 18:09:38 -04:00
f433ad3531
Changed _driven params to cross wearables; major fix so they wouldn't keep getting reset to default values from wearable.
...
Took out smoothing param.
Redefined maxeffect param to affect range of motion.
2011-04-03 17:25:17 -04:00
a47ea6c619
Added breast sway (left-right).
2011-04-03 13:56:55 -04:00
27f8b19040
Increased butt physics range.
...
Added more logic to not center camera during edit physics mode.
2011-03-30 22:16:35 -04:00
3c6e91e16d
Corrections for butt motion in avatar_lad.xml.
...
Reduced extent of belly motion.
2011-03-30 19:49:35 -04:00
23fe1a4787
Changes to better logically group avatar_lad.xml physics params.
2011-03-30 19:07:38 -04:00
717d81daa7
Added left-right butt control.
...
Did a bunch of code cleanup.
2011-03-21 12:04:31 -04:00
49e449e3a6
Added more belly bounce. Added butt driver param back in.
2011-03-18 18:59:59 -04:00
f2b65e07d0
Took out unnecessary Butt Physics parameter.
2011-03-18 18:06:10 -04:00
53a944f285
Set default parameters.
...
Renamed various parameters.
2011-03-18 18:02:27 -04:00
86613fd388
Variety of fixes for param ranges.
...
Turned off normal/binormal effects for morphing.
Fixed issue where updates were always being sent even if below the change threshold.
2011-03-18 16:04:28 -04:00
c754a7c000
Enabling for belly vertical motion.
2011-03-18 10:16:03 -04:00
3825ee503d
Work in progress. Big code cleanup ported from TheShining/avatar-physics (defunct branch).
...
Added butt and belly.
2011-03-17 17:36:01 -04:00
2915715ec4
Remove dependency on ll_align_malloc/free from avatar.
2010-11-21 05:09:59 -06:00
a5619d16f7
correct licenses (fix problem with license change merge)
2010-10-13 07:24:37 -04:00
27c855149e
First pass commit for breast physics.
2010-08-23 13:36:28 -04:00
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
62059a05cf
fix aligned malloc for osx. reviewed by falcon.
2010-05-24 17:10:21 -05:00
b35617ade2
merge
2010-05-21 14:31:59 -05:00
ab31e3bb21
Fix up the SSE stuff so it compiles on Linux. Though I don't think it actually works properly.
2010-05-21 15:11:16 +01:00
05a23f8dba
Vectorized memcpy.
...
16-byte aligned vertex buffers.
(almost) fully vectorized avatar vertex buffer updating --- index buffers still need to be vectorized
2010-05-21 04:49:12 -05:00
f142156892
Vectorized avatar vertex skinning.
2010-05-20 02:22:26 -05:00
5164ed388c
Code audit for r136515 ("merging in new wearable infrastructure...")
...
No expected functionality change; this mostly contains cosmetic cleanup.
Reviewed by: Nyx
2009-10-21 21:37:27 +00:00
d08b0b6ae8
merging in new wearable infrastructure to get a step closer to eventually supporting multiple wearables per type. Merge tested and compiles/working on linux and windows - no obvious regressions on appearance or appearance editor. Merge generated no conflicts due to being tested in fresh re-branch in avatar-pipeline/multiple-textures-12. Merge perfomed with following command:
...
svn merge -r 136489:136510 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/multiple-textures-12 .
Progress can be tracked in DEV-32551.
-Nyx
2009-10-16 17:56:30 +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
80be4c1d2d
QAR-767 Combined maint-render-7 and maint-viewer-9 merge
...
merge release@93398 viewer-merge-1@94007 -> release
dataserver-is-deprecated
2008-08-12 17:29:50 +00:00
25c10ed028
QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
...
dataserver-is-deprecated
2008-06-26 00:39:00 +00:00
3855896097
EFFECTIVE MERGES:
...
svn merge -r 79616:82632 svn+ssh://svn/svn/linden/branches/maintenance/maintenance-7 into release
svn merge -r 83211:87215 svn+ssh://svn/svn/linden/branches/php-framework-3 into release
ACTUAL MERGE: svn merge -r 87631:87698 svn+ssh://svn/svn/linden/qa/combo-merge-maintenance-7-php-framework-3 into release
dataserver-is-deprecated
2008-05-19 17:02:33 +00:00
63e7894148
QAR-570 maint-render-4 merge
...
merge -r 87067:87077 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-4-merge -> release. dataserver-is-deprecated.
2008-05-08 18:41:20 +00:00
d273ba2ce2
Back out QAR-520 maintenance-7 merge -- svn merge -r 86947:86946 svn+ssh://svn.lindenlab.com/svn/linden/release dataserver-is-deprecated
2008-05-07 20:48:38 +00:00
e1e1212daa
QAR-520 maintenance-7 merge -- svn merge -r 84923:86093 svn+ssh://svn.lindenlab.com/svn/linden/qa/maintenance-7-sandbox-84884 -- dataserver-is-deprecated
2008-05-07 17:17:42 +00:00
377ae59c21
merge Branch_1-19-1-Viewer -r 80930 : 81609 -> release
...
DEV-11202: Unhandled Excpetion in pipeline.cpp.
Merged over updated windlight ui help text from windlight14.
Reverting a const change in a virtual that was not propagated to all overrides.
DEV-10957 stop and pause Media and music buttons do not work
DEV-10762 Displayed page in the client browser disappears when crossing property boundaries.
DEV-11220 replace misspellings in alerts.xml parameters of 'messsage'
DEV-11221 fix a misspelling of 'participants' in floater_chat_history.xml tooltip
DEV-11193 clean up some viewer strings related to Windlight help text
svn merge -r81144:81147 svn+ssh://svn/svn/linden/branches/1-19-1-viewer-threads
DEV-11110 Media browser history dropdown does not save items across sessions
Ran the xuiparse -process tool on all en-us xml files. This does NOT change any data, merely reorders attributes and cleans up tab/spacing.
DEV-11349 XML CLEANUP: fix duplicate sibling names in en-us xui files
DEV-11348 Change to llmimetypes.cpp broke Media Type dropdown
dev-10623 "parcels that played movies no longer work in combo-merge-ui"
DEV-11379 - crash in LLTabContainer::draw()
DEV-11377 Elminiate dangerous LLLinkedList and LLDoubleLinkedList from newview
DEV-11158 sculpties on the top10 crash list
DEV-11404 "Send Current URL to Parcel" does not set the MIME type
merge 80958:80959 maint-ui-9-qa, DEV-11105 -- Searching for people with 3 characters like "j l" hurts the database.
DEV-10489: no draw distance cheating
DEV-879: water noise frequency
DEV-10764: macbook air support
DEV-10878: Linux Intel945 support
DEV-7551: featuretable adjustments for framerate.
DEV-11426 Enormous mini-map.
DEV-11505 - Crash in gunzip_file.
Removed final LinkedList, SkipMap, and AssocList templates from the Viewer!
DEV-11115 truncated word in the Advanced Water Editor's modal help dialog
2008-03-11 01:47:36 +00:00
b01d567a5d
EFFECTIVE MERGE: merge release@73232 maint-viewer-2@75100 -> maint-viewer-2-merge
...
EFFECTIVE MERGE: merge -r 74370 library-update -> maint-viewer-2-merge
ACTUAL MERGE: release@75267 maint-viewer-2-merge@75293 -> release
2007-12-07 20:27:13 +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
d373dcc7cb
svn merge -r 64548:64837 svn+ssh://svn/svn/linden/branches/maintenance into release
...
* WARNING *: maintenance r64837 is not the last rev to use in the next merge. use r65269
2007-07-20 20:38:05 +00:00
1c909afe39
svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into release
2007-05-02 21:24:47 +00:00
c93c38e047
svn merge -r 59178:59364 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
2007-03-21 19:36:11 +00:00
William Todd Stinson