Commit Graph

97 Commits (8485bff29b98f47954b78b31b2e0511f94de3be4)

Author SHA1 Message Date
Tonya Souther b0a1bae050 Adding comment from STORM-1118 to explain a magic number. 2011-04-15 08:03:45 -05:00
Kadah 2bcb47f312 Fix for compile error on windows from 51f9968d4694 (STORM-1118 Viewer crashes when user tries to upload image without JFIF header (from V2 - Vadim ProductEngine)) 2011-04-10 21:28:32 -07:00
Tank_Master f9ed638991 STORM-1118 Viewer crashes when user tries to upload image without JFIF header (from V2 - Vadim ProductEngine) 2011-04-09 23:51:42 -07:00
Arrehn 10e88f3891 Merge with RLVa-LL2.5.2 2011-04-09 22:24:22 -07:00
Tank_Master d3d4aa37eb Backported from Viewer-Dev (14684 (b047db67c337) fix a minor memory leaking flaw for SH-895: some mild memory leaking (partially)) 2011-02-10 08:13:49 -08:00
Xiaohong Bao 436fe6a412 fix a minor memory leaking flaw for SH-895: some mild memory leaking (partially) 2011-02-01 17:53:25 -07:00
Xiaohong Bao 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
Xiaohong Bao e3f5b66d5a fix for SH-829: Viewer attempting to load precached images in file types that are not being used. 2011-01-20 15:20:27 -07:00
Tonya Souther 2bbcd99976 Handle PNG images with background color specified correctly (ignore the background). From ThickBrick Sleaford, fixes VWR-24420/STORM-839. 2011-01-11 10:50:27 -06:00
Thickbrick Sleaford db1a63e99e FIX VWR-24420 Keep alpha channel in PNG images with background color.
Remove code that composites RGBA PNG images that specify a background
color down to RGB.
2011-01-09 01:13:38 +02:00
Merov Linden 922f4e59ab STORM-744 : Turn llimage/tests/ on again 2010-12-17 11:30:52 -08:00
Merov Linden 0e07758b54 merge with STORM-105 and viewer-development 2010-11-10 22:39:11 -08:00
Merov Linden b5df1d2abc STORM-105 : takes Vadim's comments into account, clean up use of static globals and magic strings, enforce naming conventions 2010-11-08 17:16:31 -08:00
Merov Linden 85509457c6 STORM-105 : Take Vadim code review into account, code clean up 2010-11-05 18:40:08 -07:00
Merov Linden 4bbe823302 merge with STORM-105 2010-11-04 18:10:29 -07:00
Merov Linden ba3307b8d0 merge with STORM-105 2010-11-04 18:09:35 -07:00
Merov Linden f7af29ab40 merge with viewer-development 2010-11-04 14:30:32 -07:00
Merov Linden c2500f808c STORM-105 : Tweak the data labels to make them easier to read 2010-11-04 13:52:46 -07:00
Andrew Productengine 9d97a16481 STORM-472 Fixed crash that happened while decoding jpg image.
In case of files provided in ticket problem occured in libjpeg's jpeg_start_decompress(to be more specofic- inside it's _jinit_color_deconverter()) because if cinfo's out_color_space is RGB, then jpeg_color_space can't be JCS_YCCK (JCS_YCCK jpeg_color_space is possible for JCS_CMYK out_color_space). So when the combination of RGB and JCS_YCCK was encountered, jpeglib called ERREXIT() inside which exit() was called and viewer crashed.

- Checking for this combination before calling jpeg_start_decompress() would solve this problem in this specific case, but there are a lot of possible error combinations which cause libjpeg to exit and thus crash viewer, so copypasting checks from it into viewer code would be cumbersome, uneffective and ugly. So another approach was used instead- by default libjpeg calls exit() after encountering an error, but user can provide his own error handling function instead. on_jpeg_error() function was added in fix for this. It sets true a boolean flag that is used to determine whether there were errors in getImageDimensionsJpeg(), and this function's return value depends on it.
2010-11-03 18:23:53 +02:00
Merov Linden dac53830f1 STORM-104 : make kdu statically linked, suppress the need for llkdu 2010-10-27 23:40:35 -07:00
Merov Linden 40979589af STORM-105 : improve decompression perf gathering, allow perf name to be passed on the command line, fix crash in analysis phase 2010-10-27 23:15:22 -07:00
Merov Linden 88e33d00cd STORM-105 : Add compression data gathering, took partial decompression into account in stats 2010-09-17 19:17:12 -07:00
Merov Linden 8ada6ed3cf Pull update from viewer-development 2010-09-16 20:09:36 -07:00
Boroondas Gupte 6e1ba9c960 merged STORM-130 (a.k.a. VWR-22769, SNOW-737 Version agnostic libPNG linking) 2010-09-15 16:07:13 +02:00
Merov Linden 39e5d2ecf0 VWR-22761 : Rearchitecture of llmetricperformancetester and simple (non complete) implementation in llimagej2c 2010-09-08 23:03:56 -07:00
Xiaohong Bao a0611b5a01 Automated merge with http://bitbucket.org/TheShining/viewer-development 2010-09-07 13:27:49 -06:00
Xiaohong Bao 497d35af48 fix for VWR-22813: crash at [1] LLImageBase::allocateData(int) [secondlife-bin llimage.cpp] 2010-09-07 10:48:06 -06:00
Boroondas Gupte 9c4a2547b9 SNOW-737 FIXED Version agnostic libPNG linking
Patch from http://jira.secondlife.com/secure/attachment/41125/version_agnostic_libpng__1.diff
applied with fuzz 3:

	patching file indra/cmake/PNG.cmake
	Hunk #1 succeeded at 6 with fuzz 3 (offset -2 lines).
	patching file indra/llimage/llpngwrapper.cpp
	Hunk #1 succeeded at 215 (offset -2 lines).
	Hunk #2 succeeded at 363 (offset -2 lines).
	patching file indra/llimage/llpngwrapper.h
	Hunk #1 succeeded at 31 (offset -2 lines).

Added entry in doc/contributions.txt.
No further changes other than that.
2010-08-29 18:32:20 +02:00
Aaron Terrell (Enus) 48743cbd41 standardizing test suite names as class name under test 2010-08-24 23:41:47 -07:00
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04:00
Xiaohong Bao cd628d8ea8 merge the fix of SNOW-793: memory leak in LLImageFormatted::appendData 2010-08-04 16:58:21 -06:00
Xiaohong Bao 84d3eb1bee Automated merge with ssh://hg.lindenlab.com/q/viewer-release 2010-06-16 14:08:51 -06:00
Lynx Linden b2b6d52807 EXT-7851 FIXED Cleaned up code to avoid confusion.
The mTmpWriteBuffer member variable was never actually being allocated
because it was being shadowed by a local variable. This is why the
code never crashed. I've removed the member variable as it was clearly
never used and really confused the code.
2010-06-15 17:28:17 +01:00
Lynx Linden 1a190182ea EXT-7851 FIXED Memory leak in LLImagePNG::encode()
We were not freeing the temporary image buffer if the PNG encoding
failed. This probably doesn't happen very often, but it's good to plug
the leak all the same.
2010-06-14 16:02:55 +01:00
Xiaohong Bao 8108de817c EXT-6567: POSSIBLE FIXED: crash at LLImageBase::allocateData [secondlife-bin llimage.cpp:170];
also removed the debug code for this bug.
2010-06-16 11:42:05 -06:00
Xiaohong Bao 87be73be24 fix for EXT-7159: textures are not fully loaded when http-texture is enabled.
and EXT-6928: Viewer crashes immediately after enabling HTTP Textures on a http-texture-server-1 simulator
2010-04-28 17:07:24 -06:00
Tofu Linden 62a09f3ea9 dos2unix this header :( 2010-04-21 11:30:17 +01:00
Yuri Chebotarev 6ed8c492f5 fix for EXT-4082 Normal Uploading huge image crashes viewer
https://codereview.productengine.com/secondlife/r/11/
reviewed Tofu Linden

--HG--
branch : product-engine
2010-04-20 15:47:02 +03:00
Xiaohong Bao 990011f3d6 make LLImageBase::allocateData() thread-safe.
insert debug code for EXT-6567: crash at LLImageBase::allocateData [secondlife-bin llimage.cpp:170]
2010-04-01 10:30:27 -06:00
Xiaohong Bao 5b7f8c719b debug code for EXT-5599: Viewer crashes consistently, in Linden Homes region. 2010-03-10 17:33:43 -07:00
Tofu Linden 9fee359d1b CID-3
Checker: CHECKED_RETURN
Function: LLImageDecodeThread::update(unsigned int)
File: /indra/llimage/llimageworker.cpp
2010-02-13 14:37:48 +00:00
Karl Stiefvater (qarl) de2fabcf3d EXT-4929 Crash in llimage.cpp
EXT-4713 Hook attachment from loco pocos pirate outfit causes viewer crash

removed broken assert (all cases are covered by asserts downstream.)
reviewed by James.
2010-02-08 13:13:16 -06:00
Leyla Farazha 2981e9aa4c checking for null in LLImageRaw::copy to prevent a crash 2010-01-21 15:10:25 -08:00
Steve Bennetts 0db73b1ac5 merge 2009-11-06 12:20:52 -08:00
Steve Bennetts afe6350160 merge from texture-pipeline 2009-11-06 12:15:41 -08:00
Tofu Linden 66171216b0 SNOW-329 Handling of error case in llimage.cpp incorrect
This is the same fix as DEV-32269, trivially ported to viewer2.
reviewed by merov, james, moss!
2009-11-06 15:19:30 +00:00
Xiaohong Bao 35e200881c merge QAR-1829: texture pipeline branch in viewer-2.0.0.3 2009-11-06 06:52:24 +00:00
Mark Palange (Mani) 3e10fa4d51 merge from latest svn/viewer-2-0 to hg/viewer-2-0 2009-10-16 16:42:45 -07:00
Adam Moss 406927f629 Merge a big bunch of fixes from maint-viewer. Hooray.
svn merge -r136066:136073 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-viewer/maint-viewer-24-qa-9

DEV-8553 New Server Tools - Prep Land For Sale
DEV-32942 (QAR-1521) Bad border crossings or TP / Ruthing issues
DEV-32942 (QAR-1521) Bad border crossings or TP / Ruthing issues
DEV-33239 VWR-13816: Resizing the Search Window Causes the Results to Refresh back to First Page
DEV-27746 Running a dev build of Second Life will make console window show up on non-dev builds (Windows)
DEV-33209 Linux 1.24.0.120778 client fails to run
DEV-29123 SVC-3871: Crash of viewer when clicking on ghost objects at (0,0,0) on a sim
DEV-35433 Attempting to upload wrong file type crashes viewer
DEV-33499 viewer2009 is not using KDU
DEV-33912 Griefing viewer crashes others' viewers with malformed sound files
DEV-3784 VWR-138: Animation Priority not working correctly, Can't create new AOs
DEV-20678 VWR-9069: Region variable says 'Region Name' in AR if no object is selected
DEV-19934 Help->About Second Life doesn't differentiate between 32- and 64-bit Vista
DEV-6604 Restored folders have 'Purge Item' and 'Restore Item' options
DEV-12867 VWR-5717: Selected Text is not replaced by Input text when Japanese IME is on
DEV-11894 Notecards/Texture windows don't open completely when opened from inventory
DEV-10641 VWR-4955: Local Chat doesn't show end of last conversation
DEV-30039 VWR-12620: Viewer build fails on Linux when compiled with -O2 (--type=Release)
DEV-20944 VWR-9065: (intermittent) Right Click >profile on avatar does not display profile
DEV-24828 Menu accelerator prefixes shouldn't be hard-coded
DEV-34529 VWR-14267: Clicking send in an IM window does not add the sent text to the line editor history
DEV-34124 Invite to group, search by name will not show resident if their first name is two characters
DEV-20930 VWR-9248: On Mac: the "--url" option causes a command line parsing error
DEV-35306 Adult keyword filter triggers multiple warnings
DEV-35503 VWR-3595: "Second Life requires True Color (32-bit) to run in a window" message is incorrect
DEV-35656 VWR-12995: FTBFS: error: format '%-3d' expects type 'int', but argument 3 has type 'size_t'
DEV-30043 VWR-12533: Linux viewer build for OpenAL fails during packaging unless FMOD library is available
DEV-31898 VWR-13202: Right clicking mouse triggers arrow key control events
DEV-32610 Keyboard shortcuts on OSX viewer overridden by OSX
DEV-27067 Coverity Prevent: EVALUATION_ORDER defects
DEV-26188 VWR-2242: Specially formatted .BVH file can cause avatar distortion
DEV-25475 About Land dialog no longer shows Area: field
DEV-19897 OSX Viewer Installer (for an RC) opens with poor positioning
DEV-22837 Inventory> Search Recent Items highlighting incorrect characters
DEV-21709 VWR-9377: Mapping will default to leave exact sim name listing first. (Searching Gar forces Gar to come up and not Garden of Dreams)
DEV-23079 implement volume serial for linux client
DEV-13930 VWR-6432: Space Navigator operation with vehicles is broken
DEV-27666 VWR-10829: Linux Viewer: CLICK_ACTION_PAY shows CLICK_ACTION_PLAY icon
DEV-23670 Viewer crashes on startup if installed into a custom folder with Korean, Japanese or Chinese characters in path
DEV-19313 VWR-8454: PARCEL_FLAG_ALLOW_CREATE_GROUP_OBJECTS not highlighted in script editor
DEV-19918 VWR-8885: Move character/*.xml files to source bundle
DEV-25555 VWR-11172: A source coding mistake prevents number-pad keys from specifying Ctrl+digit shortcuts on Windows
DEV-8536 VWR-4057: Multi-line chat display bug - first character in line missing
DEV-29592 Mac LLFastTimer uses wall clock instead of Intel PMU
DEV-29644 VWR-12587: Cmake install target has a hard coded secondlife-bin reference remaining
DEV-25320 VWR-11128: Python not always detected by develop.py
DEV-30040 VWR-12617: Poor type name that violates Coding Standard breaks compatibility with system header files
DEV-30380 indra/newview/res-sdl/toolpay.BMP is modified during ./develop.py configure
DEV-31247 VWR-12763: non-portable printf specifier used with size_t causes FTBFS on 64bit (due to -Werror)
DEV-29565 VWR-12569: A comment in lluistring.h contains undefined UTF-8 code sequences
DEV-22100 VWR-9620: send_parcel_select_objects in newview/llfloaterland.cpp uses the wrong datatype for the ReturnType field causing a warning
DEV-31911 Selected objects / primitives should be greyed out when nothing is selected
DEV-3667 Windows: Accelerator keys should be "Ctrl+X" rather than "Ctrl-X"
DEV-27223 disable gstreamer on 64-bit linux
DEV-8172 We Need a Linden Sale Option to Sell Land to Anyone
DEV-25511 VWR-10311: Enable LipSync by default
DEV-20443 Revamp group creation confirmation dialog to be more communicative
DEV-20132 VWR-7800: Joystick / SpaceNavigator. Camera should remain in position when exiting flycam mode into avatar mode.
DEV-18420 VWR-8393: Have build scripts copy fmod from an external location
DEV-24841 VWR-10717: Right Space Navigator button should toggle fly in avatar movment, not jump/flyup.
DEV-28457 change auto-populate value in buy L$ window from 1000 to 2000
DEV-15545 VWR-3725: Please add resize option to the SEARCH window UI
2009-10-14 10:40:56 +00:00
Bryan O'Sullivan 30ff6cabd6 Merge with trunk 2009-08-31 13:47:47 -07:00