Commit Graph

14741 Commits (543edbcdc0b2d3dd921273533b3b1c2ff852a91b)

Author SHA1 Message Date
Loren Shih 543edbcdc0 Manual merge of llviewerwindow.cpp from mesh-development. 2010-11-08 13:09:15 -05:00
Loren Shih cd09b01906 Backout merge of llviewerwindow; need to do manual merge since this is messy.
This checkin causes llviewerwindow to become the viewer-development version.
2010-11-08 13:07:01 -05:00
Loren Shih a5e63b1dc0 Merge 2010-11-08 12:57:26 -05:00
Nyx Linden b3ab10923d SH-396 WIP fix mac opensource build
Missed a reference to libcollada in viewer_manifest.
Hopefully should be packaged and set properly now.
2010-11-08 11:49:52 -05:00
Nyx Linden 3d41e67d7b BUILDFIX: commented out unused variable which breaks the mac build. 2010-11-05 18:51:43 -04:00
Nyx Linden d20412321b Automated merge with https://hg.secondlife.com/mesh-development 2010-11-05 17:58:32 -04:00
Nyx Linden 985f4f911e SH-396 FIX mac build on mesh-development is broken
Adding collada to the list of libraries we need to package with the viewer
Not sure why this wasn't here earlier, but this should solve the packaging problem.
2010-11-05 17:58:13 -04:00
Brad Payne (Vir Linden) 69062ccf7b merge 2010-11-05 17:13:17 -04:00
Nyx Linden 1c2379becb SH-396 WIP mac build broken on mesh-development
Finally fixed collada dynamic library location issue. Should fix mac build if the library
is being packaged properly.
2010-11-05 16:28:19 -04:00
Brad Payne (Vir Linden) 7318214ed3 merge 2010-11-05 16:17:54 -04:00
Brad Payne (Vir Linden) ddff1c68f2 additional analysis for --analyzeperformance option 2010-11-05 16:17:24 -04:00
Nyx (Neal Orman) 4a80668567 Automated merge with https://hg.secondlife.com/mesh-development 2010-11-05 14:26:30 -04:00
Nyx (Neal Orman) 1f9ae081ec BUILDFIX making curl asserts llinfos for non-windows platforms
linux curl appears to throw an initialization error once per session
after login. Can't hunt it down right now, so making curl asserts
llinfos for non-windows platforms. Also added a new assert on curl
initialization.
2010-11-05 14:26:25 -04:00
Nyx Linden bbf581726a SH-396 WIP fix mac mesh-development build
Fixed the mac references to Collada14Dom.dylib I think. Fingers crossed!
2010-11-04 21:11:38 -04:00
Nyx (Neal Orman) a2b25828aa BUILDFIX curl error causes linux build to crash on login.
Switching curl errors from llerrs to llinfos allows the client to continue
on its merry way. Will file a jira to follow up later on why the error
happens in the first place.
2010-11-04 17:50:10 -04:00
Oz Linden 124a592631 merging up latest changes from viewer-development 2010-11-04 16:27:38 -04:00
Nyx Linden fefae4c639 SH-396 WIP fix mac teamcity build for mesh-development
making sure we're copying over the necessary 3rd party library in the packaging stage
2010-11-04 16:26:27 -04:00
Loren Shih 889aff8d87 automated merge from http://hg.secondlife.com/viewer-beta 2010-11-04 14:44:00 -04:00
Loren Shih 3bbaac0b9d automated merge up from viewer-beta 2010-11-04 14:28:30 -04:00
Dessie Linden a788b0a88c Pushing 2.3.0-beta2 tag to repo 2010-11-04 11:15:51 -07:00
Dessie Linden 4c5f8bd118 Added tag 2.3.0-beta2 for changeset db0fe9bb6518 2010-11-04 11:11:47 -07:00
Oz Linden 29283804ad merge fix for STORM-450 2010-11-04 11:57:47 -04:00
Oz Linden c97def552a merge fix for STORM-261 2010-11-04 11:56:36 -04:00
Oz Linden e32ce48d98 merge fix for STORM-194 2010-11-04 11:55:10 -04:00
Oz Linden 294fd9c1bc merge fix for STORM-536 2010-11-04 11:53:53 -04:00
Nyx (Neal Orman) aa6256b089 SH-396 FIX fix mac build on mesh-development branch
autobuild recently changed to not upload to s3 without an explicit command-line
argument. Re-uploaded (this time to s3) colladadom for mac, and updated install.xml
2010-11-04 11:11:03 -04:00
Loren Shih c245867569 Automated merge up from viewer-development 2010-11-04 10:32:58 -04:00
Paul Guslisty 211e141444 STORM-450 FIXED Incorrect help contexts for Sidebar People tab
- Added checking whether panel is in visible chain instead of just visibility checking
2010-11-04 16:16:18 +02:00
Andrew Productengine 7f0de78558 STORM-261 FIXED Changed line number color in script editor.
- Changed text_readonly_color in script editor to darker gray, so that line numbers are visible when scrip editor is out of focus.
2010-11-04 14:24:56 +02:00
JonathanLinden ffb8b78ae9 Reverting fix for SH-391 until it works for all use cases 2010-11-03 17:11:08 -07:00
Nyx (Neal Orman) 5ca2839612 Automated merge with https://hg.secondlife.com/mesh-development 2010-11-03 19:02:31 -04:00
Nyx (Neal Orman) 6c0c1c47e7 SH-396 FIX mac opensource build
Trying a new collada package for mac
2010-11-03 19:02:26 -04:00
Seth ProductEngine 0a27fe695e STORM-194 FIXED 'Show' button in inventory offer notification to open 'My Inventory' SP if attachments were offered.
Removed the check preventing inventory SP from opening when an item of IT_ATTACHMENT type has been offered.
2010-11-03 23:28:59 +02:00
Seth ProductEngine 904738c475 STORM-536 ADDITIONAL FIX Replaced extra calls to getChild() with using a member pointer to LLAccordionCtrlTabHeader. 2010-11-03 22:52:53 +02:00
Seth ProductEngine b66389df89 STORM-536 FIXED scrolling to collapsed accordion tab with keyboard arrows in Places SP->My Landmarks.
- Fixed scrolling to selected item when a folder view receives selection inside an accordion tab while being out of visible scrolling area.
- Fixed scrolling to collapsed accordion tab when it receives selection while being out of visible scrolling area.
2010-11-03 22:50:09 +02:00
JonathanLinden 117af7e7e3 Fix for SH-391 'Viewer crash when enabling align planar faces on a mesh object'. Paired with Runitai 2010-11-03 13:23:53 -07:00
Oz Linden e2714252f3 pull fix for STORM-422 2010-11-03 14:53:29 -04:00
Eli Linden 690889cfcc CT-633 WIP ES translation for Viewer 2.3, Set19 2010-11-03 11:25:36 -07:00
Dave Parks 89f191cd68 SH-281 Make UI in snapshot off by default. 2010-11-03 12:10:45 -05: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
brad kittenbrink 6a9e70053b Merge 2010-11-02 19:02:49 -07:00
brad kittenbrink 4902a2752e Bugfix for build.sh overwriting log files when build-link-parallel is disabled. 2010-11-02 19:01:27 -07:00
Nyx (Neal Orman) 3bccefff5f Automated merge with https://hg.secondlife.com/mesh-development 2010-11-02 20:32:26 -04:00
Nyx (Neal Orman) 688a818259 SH-395 FIX fixes for linux and windows collada libraries
updating windows collada libraries
2010-11-02 20:32:20 -04:00
Merov Linden accbddaead STORM-283 : merge with viewer-development 2010-11-02 17:31:01 -07:00
Merov Linden f481f13969 STORM-287 : merge with viewer-development 2010-11-02 17:29:38 -07:00
Merov Linden e9640296d3 STORM-420 : merge to viewer-development 2010-11-02 17:27:39 -07:00
JonathanLinden 278dac7ce7 Reverting code for fixing non-uniform scale for mesh uploads as it breaks rigged meshes. 2010-11-02 16:25:29 -07:00
Vadim ProductEngine 5d7417b40e STORM-422 FIXED Added command line option "-disablecrashlogger" to disable crash logger.
This is a patch originally written by Robin Cornelius.
I made it work with Google Breakpad.
2010-11-02 20:26:38 +02:00
Merov Linden 37b97d2f6d STORM-288 : merge with vewer-development 2010-11-01 23:03:27 -07:00