79029149a4
Automated merge with file:///F:%5Cviewer-bear
2013-06-21 12:51:29 -05:00
c3f14b915c
NORSPEC-229 Fix for bad binormals on mirrored surfaces (use tangent calculator instead of binormal calculator, convert binormal centric code to tangent centric)
2013-06-03 12:50:48 -05:00
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
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
08ae21f52d
MAINT-2410 Extra Particle Parameters -- viewer implementation
...
Reviewed by Kelly and Graham
2013-03-13 17:07:22 -05:00
5a436e46f6
SH-3959 WIP - pass information about type of fetched image - server bake, host bake, map tile, etc - down the chain so LLTextureFetchWorker can adjust behavior as needed
2013-03-08 17:07:17 -05: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
1f6e20c5bb
Split gl-specific LLViewerTexture implementation into llrender/LLGLViewerTexture
2012-09-04 17:43:08 +00:00
4a5ad35793
MAINT-570 Remove unused memory tracking system LLMemType
2012-07-20 11:42:15 -05:00
029103133e
MAINT-794 Factor out a lot of CPU overhead around updating objects.
2012-06-19 18:08:39 -05:00
92ee373e45
MAINT-646 Factor std::set out of lloctree
2012-06-05 12:55:17 -05:00
71bbb384b0
MAINT-753 : [crashhunters] crash at LLVOVolume::updateFaceFlags(). Null pointer checks are good.
...
Reviewed by Kelly
2012-05-07 13:24:52 -07:00
423659c680
MAINT-775 Particle vertex buffer management optimizations
2012-05-02 15:45:38 -05:00
ae0cd901f8
SH-2428 Make GCC 4.4 happy by using LLVector4a striders with LLAlphaObject subclasses -- also vectorize particle VBO updates
2011-10-04 17:25:55 -05:00
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
a5619d16f7
correct licenses (fix problem with license change merge)
2010-10-13 07:24:37 -04:00
2f012dd34f
merge
2010-08-25 14:48:18 -05:00
2fea1d5d33
Integrate SIMD API from oreh/server-trunk-oreh
2010-08-19 12:25:15 -05:00
512c9615e5
EXT-8386: FIXED: link grass rendering to the Trees Mesh detail slider
2010-07-14 13:27:58 -06:00
0e7f4dc5ce
Octree per LLVolumeFace WIP
2010-05-29 05:37:38 -05:00
4c257db33b
fix another gcc whine.
2010-05-25 12:17:33 +01:00
e6fe3b1f1a
Better vectorization of various things. Turn off debug gl by default.
2010-05-25 03:55:01 -05:00
9d72930328
fix osx build.
2010-05-24 17:19:07 -05:00
4d57cb3c09
Vectorize/memory align buffers in llvolumeface WIP
2010-05-22 04:35:02 -05:00
fc49539b36
EXT-2959 : Full out camera functions from llagent to llagentcamera
...
First check-in; only compiles, nothing more.
2010-03-23 15:59:52 -04:00
cbc0783cd1
Created lightweight LLNotificationsUtil::add(), switched most alerts to use it
...
Cuts number of includes of llnotifications.h from 300+ to 40.
2009-11-25 01:15:50 -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
58bce2d205
merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1
2009-09-09 01:26:44 +00: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
9ec432034d
merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
...
ignore-dead-branch
2009-06-21 08:04:56 +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
667ca55bad
svn merge -r106715:HEAD svn+ssh://svn.lindenlab.com/svn/linden/branches/q/notifications-merge-r106715 . QAR-1149 -- Final merge of notifications to trunk.
2009-01-05 18:59:12 +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
222bca24c1
svn merge -r95288:95907 svn+ssh://svn.lindenlab.com/svn/linden/qa/maint-server/qar-841
...
this is a combined mergeback of the following branches as per QAR-841:
maint-server/maint-server-1 (absorbed by maint-server-2)
maint-server/maint-server-2
maint-server/maint-server-3
havok4/havok4-8
havok4/havok4-9
yes dataserver-is-deprecated
2008-09-05 22:03:35 +00:00
25c10ed028
QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
...
dataserver-is-deprecated
2008-06-26 00:39:00 +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
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
ce7682c2a4
svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
...
(only inside indra)
(josh) Original log message was:
svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
bos updated it to be:
svn merge -r64837:65269 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
However, it appears it actually was:
svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
... missing some file additions.
2007-07-18 21:22:40 +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
c189fc0b57
Result of svn merge -r56700:56797 svn+ssh://svn/svn/linden/branches/more-random into release.
2007-01-18 00:44:48 +00:00
420b91db29
Print done when done.
2007-01-02 08:33:20 +00:00
Dave Parks