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

239 Commits (d5877bc365292358eb4c9b8d14d1c8a1237ca5bd)

Author SHA1 Message Date
maksymsproductengine 63cc379c72 MAINT-3270 FIXED crash in LLControlCache<unsigned int>::LLControlCache: Control named RenderAutoMuteFunctionsnot found 2013-10-04 02:50:50 +03:00
Dave Parks 9ea2d90a0d Automated merge with http://bitbucket.org/lindenlab/viewer-release 2013-06-20 12:10:26 -05:00
Graham Madarasz e413f4b335 Fixup merge diffs 2013-05-10 15:13:07 -07:00
simon 8895e79576 Merge downstream code / viewer-beta 2013-05-09 13:21:22 -07:00
simon c7f7c4bc4d Merge viewer-beta 2013-05-09 13:14:49 -07:00
Graham Madarasz 025c890958 Merge vwr-dev-mat 2013-05-01 08:11:15 -07:00
Graham Madarasz 806d09b114 Merge 3.5.1 into Materials 2013-04-30 19:50:05 -07:00
Graham Madarasz b130308d1c Restore hysteresis in llviewertexture.cpp and side-step unused var (now used again) 2013-04-26 08:10:26 -07:00
Graham Madarasz fd447189c5 Merge 3.5.1 into Materials 2013-04-25 21:00:16 -07:00
Oz Linden ddd5659f81 merge changes for DRTVWR-294 2013-04-19 10:11:29 -04:00
simon 066f2acadf Forgot to commit @#! merge 2013-04-11 16:23:36 -07:00
simon c7bab8ab8b Merge 2013-04-11 16:04:21 -07:00
Geenz cfc3757778 First pass on alpha blended materials 2013-04-11 14:57:11 -04:00
Brad Payne (Vir Linden) 56d4a9f36b SH-4057 FIX - host bake textures should start with UDP fetching now, instead of waiting to fail down 2013-04-02 17:54:30 -04:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
Dave Parks 41ca92c67c NORSPEC-54 Potential fix for crashing on all sorts of random operations. 2013-03-25 18:27:07 -05:00
prep cec27955ec merge 2013-03-18 18:11:28 -04:00
Brad Payne (Vir Linden) a365d7fb3f more urgent notification (DEBUG->WARN) for some texture fetch error cases 2013-03-18 16:41:42 -04:00
Brad Payne (Vir Linden) 7d1bd682cd cut back log spam 2013-03-18 13:38:13 -04:00
Brad Payne (Vir Linden) e288ff9695 SH-3850 WIP, SH-3959 WIP - added additional debug logging for texture loading 2013-03-15 13:26:31 -04:00
prep 8e3b190e91 merge 2013-03-11 15:17:13 -04:00
Brad Payne (Vir Linden) 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
Brad Payne (Vir Linden) 852211e2c1 tweaked and added some log messages, including more detail when an image is flagged as missing 2013-02-14 17:52:50 -05:00
Dave Parks bc60d34f68 MAINT-2368 Pull in Firestorm fix for textures unloading behind you. 2013-02-14 12:15:59 -06: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
Brad Payne (Vir Linden) 0f753a530b SH-3639 WIP - cleaned up some diagnostics and added fault injection ability. Disabled inventory retries for now. 2013-01-11 11:36:11 -05:00
Brad Payne (Vir Linden) 6479e0a59b merge 2013-01-11 11:22:24 -05:00
Brad Payne (Vir Linden) 4e1eda1c3b SH-3344 WIP - keep avatar local textures flagged no-delete while in use 2013-01-07 18:31:28 -05:00
Xiaohong Bao d3b9f446a6 fix for MAINT-2147: crash in LLTextureCache::writeToFastCache on OSX 2013-01-03 22:37:44 -07:00
Xiaohong Bao 76f78e9919 fix for SH-3151: Some textures not in view load when avatar sits down. 2012-12-20 22:31:41 -07:00
Brad Payne (Vir Linden) cbf24c55d5 SH-3344 WIP - additional debugging output for avatar local textures 2012-12-20 10:27:18 -05:00
simon@Simon-PC.lindenlab.com 40e78a80cc Pull and merge viewer-development 2012-12-04 14:31:15 -08: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
Dave Parks 5d34ac552f Automated merge with https://bitbucket.org/lindenlab/viewer-development 2012-11-20 17:03:55 -06:00
Oz Linden 7ab282a09c merge changes for DRTVWR-246 2012-11-20 11:30:31 -05:00
Dave Parks adacf00aad Automated merge with http://bitbucket.org/lindenlab/viewer-beta 2012-11-07 16:14:31 -06:00
Dave Parks a36b66bd14 MAINT-1815 Fix for excessive memory usage in Mayfair. Disable tcmalloc. Disable private memory pools. Make viewer large address aware on windows. 
Reviewed by Kelly
 2012-11-07 16:03:54 -06:00
Brad Payne (Vir Linden) d4dc41dbd5 misc error detection, debug coloration for avatar meshes 2012-11-01 14:19:00 -04:00
simon@Simon-PC.lindenlab.com 38acb45af8 Merge in latest viewer-development 2012-09-05 17:17:54 -07:00
Don Kjer 1f6e20c5bb Split gl-specific LLViewerTexture implementation into llrender/LLGLViewerTexture 2012-09-04 17:43:08 +00:00
Don Kjer c355fb98d3 Extracted texture baking system into llappearance library. 2012-09-03 06:12:50 +00:00
Oz Linden 97106c2dea merge changes for DRTVWR-194 2012-08-15 17:07:10 -04:00
Brad Payne (Vir Linden) 5ee461ab19 merge 2012-08-08 15:52:54 -07:00
Brad Payne (Vir Linden) a5c9d89b28 merge 2012-07-30 14:57:33 -04:00
Xiaohong Bao 0660f646e1 fix for SH-3237: cached sculpties do not load at the correct LOD. 2012-07-12 17:54:38 -06:00
Xiaohong Bao d99e867284 fix for MAINT-1201: 404 errors appear in the log when opening the world map 2012-07-06 16:36:12 -06:00
Dave Parks 4a5ad35793 MAINT-570 Remove unused memory tracking system LLMemType 2012-07-20 11:42:15 -05:00
Dave Parks bedbbf7c02 Merge 2012-06-28 16:32:54 -05:00
Xiaohong Bao 0730b24d7c fix merge conflicts: v-r to drano 2012-06-26 22:27:24 -06:00
Brad Payne (Vir Linden) 74d4f8af01 v-r to drano merge conflicts wip 2012-06-26 16:43:58 -04:00