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

177 Commits (c4e18fbcaab2413d153ec79356930bf667839b4f)

Author SHA1 Message Date
Ansariel 25350b9422 Merge viewer-neko 2018-01-30 15:39:28 +01:00
Andrey Kleshchev 6e445e82e2 MAINT-8091 Removed deprecated and unused private memory pooling 2018-01-30 14:03:26 +00:00
AndreyL ProductEngine 57a99273ed Merged in lindenlab/viewer-release 2018-01-17 03:20:12 +02:00
Ansariel e7715f7a31 Merge Firestorm LGPL 2017-11-30 20:33:07 +01:00
Nat Goodspeed e3a2c5e321 DRTVWR-418: Merge from latest viewer-release 2017-11-29 14:47:09 -05:00
andreykproductengine e5ef898728 MAINT-8028 Fixed memory leak in allocateDataSize() 2017-11-27 15:02:33 +02:00
andreykproductengine 01c7af846f MAINT-8028 Fixed memory leak in allocateDataSize() 2017-11-27 15:02:33 +02:00
Ansariel 960f20e437 Merge Firestorm LGPL 2017-10-28 20:20:14 +02:00
Ansariel 8084ccff3a MAINT-7633 Crash fix 2017-10-27 23:41:08 +02:00
andreykproductengine d7732280a9 Merged from viewer-lynx 2017-10-27 21:00:18 +03:00
Nat Goodspeed 0c7bc67814 Automated merge with ssh://bitbucket.org/lindenlab/viewer-release 2017-10-11 14:35:49 -04:00
Ansariel 06db7c626f Merge Firestorm LGPL 2017-10-11 17:58:16 +02:00
Ansariel 615336a4d4 Merge viewer-neko 2017-09-07 21:49:12 +02:00
ruslantproductengine 6dcde6469d [SL-711] - Eliminate some overheads in texturecache. 
- Eliminate memory overhead when need duplicated scaled image.
- Small improvement in LLImageBase::getCodecFromExtension()
 2017-06-06 15:30:03 +03:00
Nicky 2290d5ed16 Merge with viewer64, first pass. 2017-01-10 19:33:15 +01:00
AndreyL ProductEngine a65b586b18 MAINT-6729 Additional fix for crash in LLImageGL::analyzeAlpha() 2016-12-08 17:21:05 +02:00
AndreyL ProductEngine 99d76f85f9 MAINT-6729 Additional fix for crash in LLImageGL::analyzeAlpha() 2016-12-08 17:21:05 +02:00
Ansariel ae2e40d5d7 Merge "MAINT-6818 Fix for LLImageBase::allocateData crash" with our fix 2016-11-18 17:54:35 +01:00
Nat Goodspeed 434f0e161a Automated merge with ssh://bitbucket.org/lindenlab/viewer-release 2017-02-03 09:54:52 -05:00
AndreyL ProductEngine f75ea457c8 MAINT-6818 Fix for LLImageBase::allocateData crash 2016-10-19 01:12:52 +03:00
Nicky fa22626882 Merge. 2016-09-27 11:25:13 +02:00
Nicky d7a0835432 Merge. 2016-09-26 21:12:34 +02:00
Rider Linden 100aa4b79e Merge 2016-09-16 14:59:52 -07:00
Oz Linden 8c86c594be paren fix 2016-09-06 11:01:02 -04:00
Oz Linden 53f9fbcfb7 add run time error checking to LLImageRaw::scale 2016-09-06 09:11:10 -04:00
Ansariel 09b9913d35 Merge viewer-vob 2016-08-29 11:40:53 +02:00
Ansariel cb89140d29 Merge LL release 4.0.7 2016-08-11 23:42:52 +02:00
AndreyL ProductEngine 5e02d304f0 MAINT-6618 More checks 2016-08-09 19:26:30 +03:00
AndreyL ProductEngine d4b1db277c MAINT-6618 Fixed the crash in LLImageRaw::scale() + some additional checks 2016-08-09 05:07:39 +03:00
AndreyL ProductEngine 2339e759fc MAINT-4327/MAINT-6584 Supress the crash on memory allocation error when decoding J2C images 2016-07-27 05:49:07 +03:00
Nat Goodspeed acdb050ce5 MAINT-6584: Convert LLImage class hierarchy to standard 'bool' 
instead of legacy BOOL.
 2016-07-22 11:35:23 -04:00
Nicky e8aa2dd71f x64: Do not use a union of LLColor4U. Especially having the two pointer in there will blow up the struct to at least 8 byte, which will break VBO packing as this class needs to be 4 byte in size. 
(transplanted from 847df86d6b5daa69dcfc428df18876a9c1e8bef6)
 2016-04-22 14:58:25 +02:00
Ansariel 3192fe832f Merge viewer-quickgraphics 2016-03-08 01:41:31 +01:00
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
Ansariel a45d3d8421 Merge Viewer-Bear 2015-06-20 15:35:15 +02:00
ruslantproductengine 6de01b2b12 Hotfix for build on OSX with -Werror,-Wtautological-compare 2015-05-05 21:09:33 +03:00
Mnikolenko ProductEngine 89321a56fd increment viewer version to 3.7.29 2015-04-28 12:03:31 +03:00
ruslantproductengine c3affc4d6b Hotfix for build on OSX with -Werror,-Wtautological-compare 2015-05-05 21:05:13 +03:00
Mnikolenko ProductEngine bb87365c37 Merge viewer-release, become version 3.7.29 2015-04-28 13:36:35 +03:00
Oz Linden 5c6cf3e7fb restore the ll[io]fstream because we need them as wrappers on Windows for wide char paths; on other platforms they are now just typedefs to the std classes 2015-04-10 11:02:37 -04:00
Oz Linden 8b42c7898e replace llifstream and llofstream with std::ifstream and std::ofstream respectively 2015-04-07 17:59:28 -04:00
Oz Linden 3a57b18896 convert llifstream and llofstream to std::ifstream and std::ofstream respectively 2015-04-07 17:28:05 -04:00
Nicky 006190f2a1 Merge with tools update. 2015-05-05 13:09:27 +02:00
ruslantproductengine a7530cb3fa MAINT-4329 FIXED LLImageRaw::scale() scales each image *twice* for no apparent reason 
Linux & OS X compile error fix
 2015-02-23 14:06:42 +02:00
ruslantproductengine ef67802a19 Backed out changeset: 81b8de17a195 2015-02-23 14:03:07 +02:00
ruslantproductengine 6926a6977d MAINT-4329 FIXED LLImageRaw::scale() scales each image *twice* for no apparent reason 
Linux & OS X compile error fix
 2015-02-23 13:14:25 +02:00
ruslantproductengine 32bb73eff4 Backed out changeset: 4c24cfce033a 2015-02-23 13:11:34 +02:00
ruslantproductengine 59fb68799c MAINT-4329 FIXED LLImageRaw::scale() scales each image *twice* for no apparent reason 
Linux & OS X compile error fix
 2015-02-23 12:45:28 +02:00
ruslantproductengine 8c819b6980 MAINT-4329 FIXED LLImageRaw::scale() scales each image *twice* for no apparent reason 2015-02-20 01:32:24 +02:00
ruslantproductengine 4042617479 MAINT-4329 Backed out changeset: fd3a4d5c2cf5 2015-02-13 20:05:48 +02:00