livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
20,470 Commits
2 Branches
0 Tags
301 MiB
Commit Graph

60 Commits (8912a9bef62386e5eecaa61ba9079d507ae16d90)

Author SHA1 Message Date
Dave Parks 162d467b4a SH-1085 Fix for crash when unchecking "mirror." Basically got LLFace to be paranoid about who gets to touch its LLVertexBuffer members. 
Reviewed by Nyx.
 2011-03-03 16:14:52 -06:00
Dave Parks 9e0ee4dff0 SH-1006 Quick pass at cutting down the number of redundant GL calls based on data from gDEBugger. 
Reviewed by Nyx.
 2011-02-17 17:18:57 -06:00
Loren Shih bfd8efb057 Automated merge up from viewer-development 2010-12-01 10:55:24 -05:00
Oz Linden a5619d16f7 correct licenses (fix problem with license change merge) 2010-10-13 07:24:37 -04:00
Tofu Linden 393c819477 VWR-21967 There's lots of ::renderForSelect() code that we don't need any more. 
VWR-22088 Remove underlying ::renderForSelect() code (render-pipeline)
 2010-10-10 15:25:11 +01:00
Tofu Linden e416840f85 Backed out changeset c3d41f18ce2b 
back-out the back-out for this branch.  yay.
 2010-08-24 19:22:00 +01:00
Tofu Linden 98cc236503 Backed out changeset a62bf7c0af21 
Backing out this merge that I pushed (prematurely) to the wrong place.
 2010-08-24 18:44:39 +01:00
Tofu Linden 6ba23344c9 merge heads. whew. 2010-08-24 18:37:53 +01:00
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04:00
Dave Parks 2fea1d5d33 Integrate SIMD API from oreh/server-trunk-oreh 2010-08-19 12:25:15 -05:00
Dave Parks 13202e744c merge 2010-07-14 11:11:31 -05:00
Dave Parks 1ad56f84ef Line endings fix. 2010-05-21 14:33:05 -05:00
Dave Parks 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
Dave Parks bf5f215fbc Cleanup from review. 2010-05-20 02:46:01 -05:00
Dave Parks f142156892 Vectorized avatar vertex skinning. 2010-05-20 02:22:26 -05:00
Dave Parks 49579bebdd Fix for wierd triangle shadow bug and fix for ATI hating deferred rendering. 2010-05-10 13:00:36 -05:00
Dave Parks daabccebf4 Remove foot shadows from llvoavatar and add terse update to LLViewerJointMesh::updateFaceData. 
(transplanted from 14545d24820e032279c81cb386dd043eeee625f7)
 2010-04-19 23:33:34 -05:00
Dave Parks e9da44aa09 Remove foot shadows from llvoavatar and add terse update to LLViewerJointMesh::updateFaceData. 
(transplanted from 14545d24820e032279c81cb386dd043eeee625f7)
 2010-04-19 23:33:34 -05:00
Dave Parks e994b9dcee Remove foot shadows from llvoavatar and add terse update to LLViewerJointMesh::updateFaceData. 2010-04-19 23:33:34 -05:00
Dave Parks d568dbd840 Fix for busted optimizations. 
(transplanted from 6fae1a167f287f23a0cdc5dac8dfa2b74444efcf)
 2010-04-16 15:53:26 -05:00
Dave Parks a20546a5dd Fix for busted optimizations. 
(transplanted from 6fae1a167f287f23a0cdc5dac8dfa2b74444efcf)
 2010-04-16 15:53:26 -05:00
Dave Parks 12499cebcb Fix for busted optimizations. 2010-04-16 15:53:26 -05:00
Dave Parks 724e45baeb Optimize LLViewerJointMesh::updateFaceData 
(transplanted from 365d7fdcd6a16d2b2cc4cbb0d721b4011487f33b)
 2010-04-16 13:00:01 -05:00
Dave Parks 36d942b30c Optimize LLViewerJointMesh::updateFaceData 
(transplanted from 365d7fdcd6a16d2b2cc4cbb0d721b4011487f33b)
 2010-04-16 13:00:01 -05:00
Dave Parks 71b0a63c8d Optimize LLViewerJointMesh::updateFaceData 2010-04-16 13:00:01 -05:00
Dave Parks 38158f0e14 Model preview now loads materials. 2010-02-18 23:04:16 -06:00
Dave Parks adf601ef1f Draw prims using triangle strips instead of triangle lists. 2010-02-06 17:33:12 -06:00
Dave Parks 095a5e8440 Draw prims using triangle strips instead of triangle lists. 2010-02-06 17:33:12 -06:00
Tofu Linden 6e55c9549a CID-354 
Checker: UNINIT_CTOR
Function: LLViewerJointMesh::LLViewerJointMesh()
File: /indra/newview/llviewerjointmesh.cpp
 2010-01-27 17:01:02 -08:00
Eric M. Tulla (BigPapi) f344c5b7ec Fix for EXT-894: upload anim preview was using bad texture data instead of grey. 
Switched rendering of dummy mesh for previews (anim, etc) to use default image,
instead of default avatar image.
-Reviewed by nyx
 2009-11-02 18:50:50 -05:00
David Parks 536e38ad51 Merging render-pipeline-6-qa-2 into viewer-2 
Self reviewed.
 2009-09-22 11:11:45 +00:00
Steven Bennetts af98aad98d svn merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1471 https://svn.aws.productengine.com/secondlife/pe/stable-1@1476 -> viewer-2.0.0-3 
EXT-65 EXT-270 EXT-359 EXT-361 EXT-367 EXT-367 EXT-368 EXT-455 EXT-468 EXT-530 EXT-539 EXT-540 EXT-542 EXT-545 EXT-555 EXT-557 EXT-558 EXT-559 EXT-559 EXT-560 EXT-561 EXT-562 EXT-563 EXT-564 EXT-566 EXT-568 EXT-569 EXT-570 EXT-571 EXT-581 EXT-590 EXT-594 EXT-596 EXT-597 EXT-601 EXT-602 EXT-603 EXT-613 EXT-620 EXT-624 EXT-628 EXT-630 EXT-631 EXT-632 EXT-639 EXT-640 EXT-641 EXT-642 EXT-662 EXT-671 EXT-672 EXT-676 EXT-682 EXT-692 EXT-703 EXT-717
 2009-08-26 20:47:27 +00:00
Xiaohong Bao 77f56a3f3d merge QAR-1579: texture-cleanup-1. 2009-07-10 22:02:26 +00:00
Adam Moss 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
Eric Tulla 6db6d81b0a Merging in Avatar Pipeline work for Viewer 1.23 (QAR-1272). 
No conflicts in the merge.

Result of:
svn merge -r113372:113479 $branches/avatar-pipeline/avatar-pipeline-merge-r113370 .
 2009-03-05 00:29:27 +00:00
Brad Kittenbrink 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
Aaron Brashears 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
Mark Palange 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
Eric Tulla 939a506569 Merging in file-move-merge ( QAR-649 ) 
Result of "svn merge -r 90669:90786 $tulla/file-move-merge ."

Be careful of future merges involving changes to any of these moved files as SVN usually does the wrong thing:
newview/llglslshader.* -> llrender/llglslshader.*, llrender/llshadermgr.*, newview/llviewershadermgr.* (gets split into 3 separate files)
newview/llpostprocess.* -> llrender/llpostprocess.*
newview/llrendersphere.* -> llrender/llrendersphere.*
newview/llcubemap.* -> llrender/llcubemap.*
llwindow/llgl.* -> llrender/llgl.*
llwindow/llglstates.h -> llrender/llglstates.h
llwindow/llgltypes.h -> llrender/llgltypes.h
llwindow/llglheaders.h -> llrender/llglheaders.h
 2008-06-30 17:57:00 +00:00
Steven Bennetts 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
Steven Bennetts 25c10ed028 QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 
dataserver-is-deprecated
 2008-06-26 00:39:00 +00:00
Steven Bennetts 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
Eric Tulla e77de5d685 Result of svn merge -r 87455:87538 $SVN/branches/tulla/vc3-merge . 
Passed QA as part of QAR-491.
 2008-05-14 21:37:13 +00:00
Steven Bennetts 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
Steven Bennetts e3b97ac65b merge release@82383 viewer-cleanup2-7-merge@82828 
QAR-369
 2008-03-20 21:41:26 +00:00
Steven Bennetts 672a76d0ea reverting premature commit at 82410. 2008-03-15 01:18:27 +00:00
Mark Palange 04611efae8 [NOTE: This was an erroneous commit, and was reverted in the next revision] 
QAR-369 - viewer-cleanup2-7 81916 merged into release.
 2008-03-14 23:21:38 +00:00
Brad Kittenbrink 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
Aaron Brashears 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
Don Kjer 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