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

33 Commits (8f892d0f36fda170a5cecf0aea89887d6d0e45ef)

Author SHA1 Message Date
Loren Shih 36a10312a5 EXT-7526 WIP Add baked texture information to texture view 
More informative logic added in to track when an upload is actually happening.
Did some minor reformatting.
 2010-06-04 14:56:24 -04:00
Loren Shih f457eaf67d EXT-7526 WIP Add baked texture information to texture view 
Added color, emphasis, and more information to texture view.
 2010-06-04 14:14:36 -04:00
Loren Shih 6a3ff07783 EXT-7504 WIP Force decloud after timeout using lower res textures 
Added fix for logic behind resetting upload timer.
 2010-06-04 12:56:17 -04:00
Loren Shih 158e46969f Fix for Linux confusion between ">>" and "> >" 2010-06-03 14:54:51 -04:00
Loren Shih 4f95701895 EXT-7504 WIP Force decloud after timeout using lower res textures 
EXT-7626 FIXED LLTexLayer header file cleanup
EXT-7628 FIXED Don't cache lower res baked textures

Added more information into the texture debug view.
Mangled hash when uploading lower res baked textures so they're not cached
Lots of superficial cleanup on lltexlayer and associated classes.  Removed some unused functions and member variables as well.
 2010-06-03 14:25:32 -04:00
Loren Shih 609c389b89 EXT-7526 WIP Add baked texture information to texture view 
EXT-7504 WIP Force decloud after timeout using lower res textures

Better formatting for baked texture information.
Also added exponential timeout for sending low res baked textures.
 2010-06-02 17:30:34 -04:00
Loren Shih 7ea46b968c EXT-7504 WIP Force decloud after timeout using lower res textures 
Changed timeout behavior to be recurring, so that low res textures are uploaded every X seconds as needed.
 2010-06-01 16:06:42 -04:00
Loren Shih 7efaa216a1 EXT-7504 WIP Force decloud after timeout using lower res textures 
Code cleanup.
Some minor changes in logic for when low res texture is used.
Added more metrics to notifications and texture debug output.
 2010-05-28 16:45:23 -04:00
Loren Shih e89611291e EXT-7504 WIP Force decloud after timeout using lower res textures 
EXT-7526 FIXED Add baked texture information to texture view

First attempt at low res textures after timeout.
Added debug setting to control whether low res texture timeout is used.
Added baked texture load information to texture view debug display.
Trivial name changes to some variables.
 2010-05-27 18:59:28 -04:00
Xiaohong Bao 0dee7a3ece debug code for EXT-6791: Intel 965 Crash in glCopyTexSubImage2D. 2010-04-09 22:02:32 -06:00
Nyx (Neal Orman) 52a21a301b EXT-2818 not using IMG_INVISIBLE in baked textures 
this patch allows IMG_INVISIBLE in an alpha mask to set the baked texture to
also be IMG_INVISIBLE for the appropriate baked texture.

Will be post-reviewed with other alpha mask fixes.

--HG--
branch : avatar-pipeline
 2009-11-24 18:25:20 -05:00
Nyx (Neal Orman) 258eb3d7dd EXT-1823 avatar shape corrupted with huge legs/feet 
As suspected a morph mask issue. Apparently we were setting success to false
if the user specifies a pant or shrit texture without an alpha channel.
Result: bad morph masks.

Patch begins to clean up the isMorphMaskValid issue, as well as fixing this
error.

Code reviewed by Vir
 2009-11-06 13:10:38 -05:00
Loren Shih 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
Neal Orman 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
David Parks 536e38ad51 Merging render-pipeline-6-qa-2 into viewer-2 
Self reviewed.
 2009-09-22 11:11:45 +00:00
Neal Orman 56e0455479 QAR-1602 Checkpoint for Avatar Pipeline Multiple textures branch 
Merging changes for first checkpoint of multiple textures branch as part of the avatar pipeline project (AVP). Functionality should be same as before, but sets up the structure that later changes build upon. Changes passed QA, merge conflicts were minimal and easily resolved. Contact Nyx with any problems with this code.


 -Nyx
 2009-07-14 15:14:46 +00:00
Xiaohong Bao 77f56a3f3d merge QAR-1579: texture-cleanup-1. 2009-07-10 22:02:26 +00:00
Steven Bennetts 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
Adam Moss 9dfe0ca9a0 svn merge -r121194:121210 
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.onetwo-merge-1

QAR-1531 viewer 1.23rc1+1.23rc2 merge to trunk
 2009-05-22 09:58:47 +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
Mark Palange 446c55538e svn merge -r106055-107012 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer_1-22/ 
merge RC5 changes into trunk, plus add'l localization xml (all newly added) files that should have been added with RC0-RC4 merge, but weren't.
 2009-01-13 03:46:56 +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 fb793870fe QAR-1142 merging 1.22 RC0-RC4 changes. 
svn merge -c 106471 svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_1-22-106055_merge
 2008-12-23 19:39:58 +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
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
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
Christian Goetze ce0a5fe145 EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release 
Actual action: branched maintenance-r68118, merged in release, then copied result into release
 2007-08-21 22:17:53 +00:00
Don Kjer e5124431b5 svn merge -r 64079:64548 svn+ssh://svn/svn/linden/branches/maintenance into release 2007-07-02 17:10:30 +00:00
Kelly Washington e03bb0606a merge -r62831:64079 branches/maintenance to release 2007-06-21 22:40:22 +00:00
Josh Bell c93c38e047 svn merge -r 59178:59364 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release 2007-03-21 19:36:11 +00:00
James Cook 420b91db29 Print done when done. 2007-01-02 08:33:20 +00:00