4d57cb3c09
Vectorize/memory align buffers in llvolumeface WIP
2010-05-22 04:35:02 -05:00
191fc90954
merge from viewer-public
2010-05-20 11:47:15 +01:00
9c779e222e
merge from viewer-public
2010-05-20 11:47:15 +01:00
13d2501c84
SNOW-207/DEV-42245 : FIXED : Texture loading on sculpty plants is failing making content appear to be of poor quality.
...
Patch by Thickbrick, reviewed by me.
2010-05-20 11:38:57 +01:00
d58ef90a02
explicit castfu for gcc.
2010-05-19 10:26:33 +01:00
387b7adbc4
Take a stab at baked sunlight to help low end hardware.
2010-05-18 16:59:01 -05:00
2f95a549a3
Fullbrigt skinned and fix for silly crash from not removing face references.
2010-05-01 01:55:21 -05:00
f324787a70
Rigged attachment integration WIP.
2010-05-01 00:45:44 -05:00
31a358ac1d
Fix for crash when logging in next to folks wearing rigged attachments.
2010-04-27 02:53:50 -05:00
64112134be
EXT-7060 default auto alpha masking to ON for deferred rendering (only deferred rendering)
2010-04-26 14:42:06 +01:00
0655104fa2
EXT-7060 default auto alpha masking to ON for deferred rendering (only deferred rendering)
...
(transplanted from 050ae2c9451a6b89374c5a10403f373e2475f23b)
2010-04-26 14:42:06 +01:00
9e51aa3fd6
EXT-7060 default auto alpha masking to ON for deferred rendering (only deferred rendering)
...
(transplanted from 050ae2c9451a6b89374c5a10403f373e2475f23b)
2010-04-26 14:42:06 +01:00
663725dcee
Remove calls to llpushcallstacks from inner loops.
2010-04-14 12:02:25 -05:00
47ffcdb93d
Rigged attachments (almost works).
2010-04-06 16:24:08 -05:00
ea6397fe49
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
5ba0c01ae8
merge with viewer 2 (fix windows build)
2010-02-24 10:33:14 -08:00
245fe3edc6
Fix compiler complaints about signed/unsigned mismatch
2010-02-23 23:02:20 -08:00
9cfae239a9
viewer2 merge.
2010-02-12 19:24:36 +00:00
fb994809f4
fix for EXT-5353: prim visibility issues.
2010-02-11 14:58:08 -08:00
19962a7833
merge.
2010-02-11 11:20:15 +00:00
44cfa948c7
merge.
2010-02-11 11:19:51 +00:00
60cb3f8fd2
fix for EXT-4632: LLViewerMediaTexture::getMaxVirtualSize() sometimes returns bad values.
2010-02-10 18:08:00 -08:00
fb248e7ad0
Fix for U16 dumbness (can have > 64K indices)
2010-02-10 14:47:53 -06:00
1f24e27956
Fix for U16 dumbness (can have > 64K indices)
2010-02-10 14:47:53 -06:00
1d66e3a1fb
CID-69
...
Checker: FORWARD_NULL
Function: LLFace::switchTexture(LLViewerTexture *)
File: /indra/newview/llface.cpp
not a bug.
2010-02-10 18:11:35 +00:00
54ba657e17
CID-71
...
Checker: FORWARD_NULL
Function: LLFace::getGeometryVolume(const LLVolume &, const int &, const LLMatrix4 &, const LLMatrix3 &, const unsigned short &)
File: /indra/newview/llface.cpp
2010-02-10 18:07:54 +00:00
6d4b4762d1
merge
2010-02-09 11:23:33 -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
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
adf601ef1f
Draw prims using triangle strips instead of triangle lists.
2010-02-06 17:33:12 -06:00
095a5e8440
Draw prims using triangle strips instead of triangle lists.
2010-02-06 17:33:12 -06:00
5a34cf1af8
Merge from viewer2 trunk.
2010-01-28 12:48:48 -08:00
8bf32990fc
CID-367
...
Checker: UNINIT_CTOR
Function: LLFace::LLFace(LLDrawable *, LLViewerObject *)
File: /indra/newview/llface.h
2010-01-27 16:45:42 -08:00
c6aaf115ad
Quick 'n dirty prioritization scheme for mesh loading.
...
Sprinkling of fast timers in areas that are likely to stall.
2009-12-16 09:26:53 -06:00
85488f5414
Merge of viewer 2 changes
2009-12-07 16:03:56 -08:00
7d3b3cc474
Linker optimization - use "extern template" for commonly regenerated templates
...
Also replaced many duplicate calls to LLViewerCamera::getInstance() with local pointer.
Reviewed with Ambroff
2009-11-30 14:41:52 -08:00
53495d74ee
Automated merge with ssh://palmer@hg.lindenlab.com/viewer/viewer-2-0
2009-11-17 13:40:11 -08:00
6f3536d597
Merged in viewer 2 changes, adjusted xui problems, added mesh folder type and more mesh inventory type info
2009-11-11 15:16:49 -08:00
0f6242d9fd
Sanitize naming of getWindowRect (scaled vs. raw pixels) and getWorldViewRect (scaled vs. raw)
...
Reduces chance of future UI bugs related to UI size.
Discussed with Richard.
2009-11-10 14:00:38 -08:00
afe6350160
merge from texture-pipeline
2009-11-06 12:15:41 -08:00
35e200881c
merge QAR-1829: texture pipeline branch in viewer-2.0.0.3
2009-11-06 06:52:24 +00:00
abf77532d8
fix the bug that textuer boost level is mixed with boolean numbers.
2009-11-03 19:42:52 -07:00
b81feb6ae7
Merge of viewer-2-0 changes
2009-11-02 14:16:08 -08:00
3e80fa3dbc
Sync up with render-pipeline-7 ignore-dead-branch
2009-11-02 19:55:37 +00:00
99d9712dd7
additional fix for DEV-41913: parcel media does not display on particle textures.
2009-11-01 17:27:25 -07:00
801301c435
fix DEV-41913: parcel media does not display on particle textures.
2009-10-30 21:22:47 -06:00
b403745bfe
Extra debugging info for EXT-1456
...
Reviewed by Bao
2009-10-27 11:44:23 -07:00
c2ddcfae49
fix for EXT-1328: Alpha textures are not displayed correctly when first loaded.
...
to be reviewed by davep.
2009-10-12 05:32:52 +00:00
b1a280841e
fix for DEV-40559: viewer crash when media texture appears while parcel media is loading.
2009-10-03 00:23:01 +00:00
cf9239cabc
svn merge -r 134922:134973 svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-7
...
Merging branches/media-on-a-prim/moap-7 down to viewer-2.0.
2009-10-01 02:35:53 +00:00
b5724bc0e9
SNOW-194 DEV-40415: pulling this snowglobe patch into viewer 2.0. This
...
fixes all of the parentheses warnings in the code.
Original patch was reviewed by merov (and others).
2009-09-25 16:51:25 +00:00
536e38ad51
Merging render-pipeline-6-qa-2 into viewer-2
...
Self reviewed.
2009-09-22 11:11:45 +00:00
77f56a3f3d
merge QAR-1579: texture-cleanup-1.
2009-07-10 22:02:26 +00:00
cc92525b0d
QAR-1476 Combo-merge to trunk: Viewer 1.23 RC0 and Simulator 1.26.3
...
svn merge -r118927:118939
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.0-merge-2-combo-QAR-1476
this is a composite of...
svn merge -r115088:118182
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer_1-23
conflicts resolved:
C doc/contributions.txt
C indra/llaudio/audioengine.cpp
C indra/newview/CMakeLists.txt
C indra/newview/llfloaterlandholdings.cpp
C indra/newview/llpaneldirbrowser.cpp
C indra/newview/llpanelgrouplandmoney.cpp
C indra/newview/llpreviewscript.cpp
C indra/newview/llviewermenu.cpp
C indra/newview/skins/default/xui/en-us/notifications.xml
and...
svn merge -r116937:118673
svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26
minor-to-trivial conflicts resolved:
C indra/llcommon/llversionserver.h
C indra/newsim/llrezdata.cpp
C indra/newsim/llstate.cpp
C indra/upgrade/schema_version/sequence/3/index_log_paypal.sql
2009-05-04 17:43:26 +00:00
abdc99f21b
Merge of QAR-1267 to trunk. This was a combo merge of QAR-1175 (maint-render-9) and QAR-1236 (dll-msvcrt-2)
...
svn merge -r 109838:112264 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-9-merge-r109833
2009-02-18 21:10:16 +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
f89f19990c
QAR-992 Merging revisions 101012-101170,101686-101687 of svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_combo_1-22-merge into linden/release
2008-11-07 17:51:03 +00:00
d725e5b240
QAR-872 Viewer 1.21 RC 3
...
merge viewer_1-21 96116-97380 -> release
2008-09-29 19:14:50 +00:00
4a6bacea0f
merge viewer/viewer_1-21 94170-94770 -> release
...
merge viewer/viewer_1-21-0 94830-95157 -> release
Includes:
QAR-786 Sandbox buildme for viewer + server Release Notes on the wiki!
QAR-797 teleport failures (DEV-6198 / SVC-972) mergeme
2008-08-28 23:57:41 +00:00
52562e2e66
svn merge -r92720:92721 svn+ssh://svn.lindenlab.com/svn/linden/branches/uv-picking-merge
...
QAR-698 / DEV-9985 add touch "position" information to touch-events in LSL
2008-07-23 21:20:19 +00:00
35b4a91129
svn merge -r92710:92709 svn+ssh://svn.lindenlab.com/svn/linden/release --> release
...
Undo r92710 (for QAR-698) - went straight into release instead of a side branch for validation.
2008-07-22 20:55:02 +00:00
df4f20d4f5
merge uv-picking branch.
...
svn merge -r92602:92632 svn+ssh://svn.lindenlab.com/svn/linden/branches/uv-picking-4
2008-07-22 20:12:37 +00:00
926ea0b39a
QAR-669 1.20 Viewer RC11
...
QAR-648 1.20 Viewer RC10
merge Branch_1-20-Viewer-2 -r 88724:90511 -> release
2008-06-27 21:02:01 +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
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
068da0b565
merge release-QAR-511 Viewer 1.20 RC 5
...
merge Branch_1-20-Viewer -r 85828 : 86279 -> release
2008-05-06 18:09:03 +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
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
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
029130bf9c
svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@62339 svn+ssh://svn.lindenlab.com/svn/linden/branches/release-candidate62341 -> release
2007-05-23 21:17:34 +00:00
98740db8fd
svn merge -r 59826:59968 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
2007-04-04 19:49:24 +00:00
ea8fb7238e
svn merge -r 59364:59813 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
2007-03-31 01:41:19 +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
5e9e67cb2d
merge -r 59028:59178 maintenance -> release.
2007-03-16 20:39:40 +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
305c74d516
Result of svn merge -r57264:57370 svn+ssh://svn/svn/linden/branches/adroit.r40-68 into release.
2007-02-02 17:28:58 +00:00
4617a37edf
corrected, removed, and updated comments throughout the code to be more useful. no code changes. SL-13762
2007-01-03 21:05:41 +00:00
420b91db29
Print done when done.
2007-01-02 08:33:20 +00:00
Dave Parks