Commit Graph

153 Commits (ec00f7f14fbf16992b71ddd54e583ba07fdfd523)

Author SHA1 Message Date
Oz Linden ddd5659f81 merge changes for DRTVWR-294 2013-04-19 10:11:29 -04:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
prep 8e3b190e91 merge 2013-03-11 15:17:13 -04:00
Nyx Linden 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
Don Kjer 802e738b77 Fix for alpha blending using gl fixed-functions not matching shader implementation 2012-12-18 23:40:31 +00:00
prep e0432f98ee SH-3563. Pull and merge from viewer-development. Modest code changes to fix alignment issue in llAppearance. 2012-11-28 16:36:34 -05:00
simon@Simon-PC.lindenlab.com 7f0d6e0377 Pull back viewer-development with latest beta merges 2012-10-16 09:58:31 -07:00
Oz Linden e7a5dc7cda pull back changes from 3.4.1-beta8 2012-10-16 09:36:15 -04:00
Dave Parks c97730988e MAINT-1721 Fix for crash when clicking "back" button after editing appearance.
Reviewed by VoidPointer
2012-10-15 15:59:41 -05:00
Brad Payne (Vir Linden) a039b7c489 Fixes for build issues, missing LLCOMMON_SYSTEM_INCLUDE_DIRS in some libraries 2012-10-11 13:29:36 -04:00
Don Kjer 8c0aa31536 Adding optimization to skip alpha image analysis when it isn't needed. 2012-10-04 00:42:31 +00:00
Don Kjer 8ba2b38876 Fleshed out target_link_libraries dependencies between libraries. Appearance utility now reads avatar_lad.xml during stubbed out params processing. 2012-09-13 10:25:48 +00:00
simon@Simon-PC.lindenlab.com 38acb45af8 Merge in latest viewer-development 2012-09-05 17:17:54 -07:00
Kelly Washington bfd1c0370f MAINT-570 Remove unused memory tracking system LLMemType
follow up to fix test compiles.
2012-07-20 13:28:04 -07:00
Dave Parks 4a5ad35793 MAINT-570 Remove unused memory tracking system LLMemType 2012-07-20 11:42:15 -05:00
Xiaohong Bao 0d80aced24 for SH-3073: implement a fast cache system for texture fetching 2012-06-12 17:01:48 -06:00
Brad Payne (Vir Linden) 6ee0456220 merge 2012-06-04 15:28:08 -04:00
simon@Simon-PC.lindenlab.com 1777fa5187 Merge pull from lindenlab/viewer-development as requested by Oz for DRTVWR-148 2012-05-25 15:07:22 -07:00
Oz Linden 7637acf76e merge changes for DRTVWR-149 2012-05-22 06:03:42 -04:00
Merov Linden 60f602d5e1 Pull from VirLinden/drano 2012-05-08 10:18:03 -07:00
Merov Linden 5c11b6b2e5 SH-3047 : Tweak of the performance compression data gathering code 2012-05-08 10:16:14 -07:00
Merov Linden 29da931051 SH-3047 : Tweak of the performance compression data gathering code 2012-05-08 10:16:14 -07:00
Brad Payne (Vir Linden) 678864e4ed merge viewer-release to drano 2012-05-02 13:00:59 -04:00
Merov Linden adf5b5c1ef Final pull from viewer-thx1138 2012-04-13 17:20:53 -07:00
Merov Linden 8b3703bd03 SH-3060 : Always use old byte range on low res (faster), reserve new byte range for high res. 2012-04-13 15:42:54 -07:00
Oz Linden c7c7726c6f merge changes for drtvwr-135 2012-04-13 17:11:19 -04:00
Brad Payne (Vir Linden) 8778010fee fix for linux build failure 2012-04-13 17:03:29 -04:00
Merov Linden c410a4e332 SH-3080 : Implement the TextureReverseByteRange setting so we can play with that parameter 2012-04-12 20:19:56 -07:00
Merov Linden 172b45d5a2 SH-3060 : Complete new byte range computation, clean up and back pedal on some changes that didn't pay of. 2012-04-06 18:28:47 -07:00
Oz Linden 0539de9099 STORM-1837: check for valid png header before attempting to decode 2012-04-06 14:36:58 -04:00
Merov Linden 91094d92a7 SH-3060 : Implement new byte range computation, cleaned up use of compression rate as well. 2012-04-05 22:05:00 -07:00
Merov Linden 782981866a SH-3060 : New byte range implementation. Intermediate (not working) state. 2012-04-04 18:58:34 -07:00
Merov Linden c6511d9c85 SH-3075 : Fix encoding for reversible images and small textures 2012-04-04 15:59:52 -07:00
Merov Linden df09fd8e8b SH-3060 : Preliminary implementation of the new byte range computation, implement setting to turn it on or off 2012-04-02 19:05:32 -07:00
Merov Linden fe7a4d0183 SH-3047 : Add a load_size argument to llimage_libtest and allow partial image file to be loaded. 2012-03-15 14:07:54 -07:00
Merov Linden bc6f669ff4 SH-3047 : Read the number of levels from the j2c image header instead of relying on hacked computation based on width / height. 2012-03-15 13:01:14 -07:00
Richard Linden 5a14a67e06 converted a bunch of narrowing implicit conversions to explicit 2012-02-01 13:03:46 -08:00
Dave Parks 78233d1bf9 SH-2652 WIP -- Add timers to relevant areas, pause render pipeline while occlusion queries from previous frame are still pending and perform texture decode work. 2011-12-05 17:55:40 -06:00
Xiaohong Bao 83c3d37827 trivial: change a log info for memory failure for LLImageBase 2011-11-30 11:20:26 -07:00
Dave Parks 4924f0c99b b782a75c99e6 backout cleanup 2011-10-14 12:38:48 -05:00
Dave Parks c0ca8e5e2e Merge backout of b782a75c99e6 2011-10-14 11:58:35 -05:00
Dave Parks 4331c112ab Backed out changeset b782a75c99e6 2011-10-14 11:52:40 -05:00
Xiaohong Bao d951267467 Merge from viewer-development 2011-07-15 12:14:34 -06:00
Xiaohong Bao b594d3b04d add debug mode to track the memory allocation/deallocation. 2011-05-10 21:02:20 -06:00
Merov Linden 460aa3ade7 Merge with viewer-experience 2011-05-07 11:01:58 -07:00
Merov Linden c6c1419faa EXP-664 : Make encoding parameters more resilient to bad entries, add levels as encoding parameters, update test applet to support this 2011-05-04 22:43:51 -07:00
Oz Linden 0656620e2d merge changes for storm-1187 2011-04-22 11:49:41 -04:00
Merov Linden b77a7b4711 EXP-663 : Allow creation of j2c images with precincts and blocks, limited to llimage_libtest, no viewer change 2011-04-13 18:11:56 -07:00
Merov Linden 759d72a46c EXP-669 : Refactor code to use correct LLImageFormatted methods to load images of all formats, reviewed by richard 2011-04-13 14:05:31 -07:00
Vadim ProductEngine a84c8e0704 STORM-1118 FIXED STORM-1118 Viewer crashes when user tries to upload image without JFIF header.
* Added checks for image file contents not matching the file extension (e.g. a bitmap named file.jpg).
* Added checks for abnormally short files to avoid crashes when parsing them.
2011-04-08 02:25:32 +03:00