4af7e9eb64
Merge viewer-development-shining up to REV 3bf724ecb7c6 (fix for SH-829: Viewer attempting to load precached images in file types that are not being used.)
2011-01-21 16:25:23 -07:00
c602fed9b7
fix for SH-659: small textures not loaded
2011-01-18 14:08:21 -07:00
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
838c01e87d
re-merge change from Thickbrick (minor collisions with changes from viewer-public merge)
2010-08-26 14:34:50 -04:00
e416840f85
Backed out changeset c3d41f18ce2b
...
back-out the back-out for this branch. yay.
2010-08-24 19:22:00 +01:00
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
6ba23344c9
merge heads. whew.
2010-08-24 18:37:53 +01:00
b2b670d787
VWR-20752 (SNOW-586) Align planar-mapped textures across different faces.
...
Port of svn changset 3458 from Snowglobe, with minor tweaks.
2010-08-21 01:41:27 +03:00
bb8919c013
merge from viewer-release
2010-08-20 12:16:46 -07:00
3ac134ec22
EXT-8673: FIXED: UDP texture loading is slower in 2.x viewers than 1.23.5
...
Improved the following:
1, make sure the texture callback queue is properly handled and cleaned in time;
2, estimate the LLVOTree pixel area more accurately;
3, eliminate the possibility of back and forth stopping/restarting a texture fetching
2010-08-18 11:33:01 -06:00
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
fde4edf75d
merge
2010-07-20 11:31:23 -07:00
bab5ef916c
trivial: replace some very small constant numbers with "F_ALMOST_ZERO".
2010-07-19 15:20:23 -06:00
9ed825fe5a
Line endings fix.
2010-06-17 12:47:17 -05:00
fa7d983f08
Add timer for comparison against davep/viewer-release
2010-06-17 12:44:49 -05: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
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
245fe3edc6
Fix compiler complaints about signed/unsigned mismatch
2010-02-23 23:02:20 -08:00
fb248e7ad0
Fix for U16 dumbness (can have > 64K indices)
2010-02-10 14:47:53 -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
fb994809f4
fix for EXT-5353: prim visibility issues.
2010-02-11 14:58:08 -08:00
60cb3f8fd2
fix for EXT-4632: LLViewerMediaTexture::getMaxVirtualSize() sometimes returns bad values.
2010-02-10 18:08:00 -08: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
8bf32990fc
CID-367
...
Checker: UNINIT_CTOR
Function: LLFace::LLFace(LLDrawable *, LLViewerObject *)
File: /indra/newview/llface.h
2010-01-27 16:45:42 -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
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
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
Xiaohong Bao