Commit Graph

81 Commits (7863674626bcf16ad26f3bb8e77a6ca41998c36b)

Author SHA1 Message Date
Dave Parks 2504824d59 Fix for crash when toggling anisotropic filtering. 2010-10-21 14:24:49 -05:00
Oz Linden a5619d16f7 correct licenses (fix problem with license change merge) 2010-10-13 07:24:37 -04:00
Dave Parks 7c2b9221d6 merge 2010-09-27 15:20:27 -05:00
Brad Payne (Vir Linden) 90e3d83a5c Fix for build failures - disabling tcmalloc for now 2010-09-21 13:26:52 -04:00
Xiaohong Bao 2969599880 a try to fix EXT-6791: [crashhunters] Intel 965 Crash in glCopyTexSubImage2D 2010-08-30 18:06:45 -06:00
Dave Parks 2f012dd34f merge 2010-08-25 14:48:18 -05:00
Tofu Linden 6ba23344c9 merge heads. whew. 2010-08-24 18:37:53 +01:00
Tofu Linden 6fbc79d5e8 Final(???) merge from viewer-release to viewer-public. 2010-08-24 14:52:05 +01:00
Tofu Linden ce1a0c6baf Final(???) merge from viewer-release to viewer-public. 2010-08-24 14:52:05 +01:00
Xiaohong Bao f263ee0444 added a toggle "LLGLManager::mDebugGPU" for debugging certain CPUs.
added more debug code for EXT-6791: [crashhunters] Intel 965 Crash in glCopyTexSubImage2D
2010-08-23 11:32:58 -06:00
Xiaohong Bao 17553add7c added a toggle "LLGLManager::mDebugGPU" for debugging certain CPUs.
added more debug code for EXT-6791: [crashhunters] Intel 965 Crash in glCopyTexSubImage2D
2010-08-23 11:32:58 -06:00
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04:00
Xiaohong Bao 5f400b3b7c more debug code for EXT-6791: [crashhunters] Intel 965 Crash in glCopyTexSubImage2D 2010-07-22 11:38:26 -06:00
Xiaohong Bao 731086241b EXT-8457: FIXED: crash at [1] LLImageGL::checkTexSize(bool) [secondlife-bin llimagegl.cpp] 2010-07-22 11:28:16 -06:00
Tofu Linden 7ac8658c77 (hairy) merge from viewer-release 2010-07-26 10:34:39 +01:00
Tofu Linden 44d0fd81ee (hairy) merge from viewer-release 2010-07-26 10:34:39 +01:00
Dave Parks 13202e744c merge 2010-07-14 11:11:31 -05:00
Leyla Farazha b088449517 Merge from ssh://hg.lindenlab.com/dessie/viewer-release 2010-06-21 11:24:33 -07:00
Leyla Farazha a6cf0bed74 Merge from ssh://hg.lindenlab.com/dessie/viewer-release 2010-06-21 11:24:33 -07:00
Karl Stiefvater (qarl) 07f9e9035e EXT-4388 Crash in octree line segment intersection code (getMask) 2010-06-18 13:29:10 -05:00
Dave Parks 98d72d1dd3 Disabling some asserts for now so client is usable. 2010-05-22 12:49:32 -05:00
Tofu Linden 5ab2d07555 EXT-7162 90% transparent textures are invisible when Lighting and Shadows are enabled 2010-04-30 13:50:59 +01:00
Tofu Linden d3eb6ffff5 EXT-7162 90% transparent textures are invisible when Lighting and Shadows are enabled 2010-04-30 13:50:59 +01:00
Tofu Linden b0fa1e011f EXT-7162 90% transparent textures are invisible when Lighting and Shadows are enabled
(transplanted from 0aaf4b4676f27560cc436d0ff74b7d812a1e6662)
2010-04-30 13:50:59 +01:00
Tofu Linden f28a9b3ca5 merge from viewer-trunk 2010-04-19 14:30:43 +01:00
Tofu Linden b362cc60d9 merge from viewer-trunk 2010-04-19 14:30:43 +01:00
Tofu Linden 230314ac71 merge from viewer-trunk 2010-04-15 20:39:00 +01:00
Tofu Linden 5dda65c030 EXT-4388 Crash in octree line segment intersection code (getMask)
Add yet more paranoia-and-return-or-assert, this time for +-INF in input vector.
To be reviewed by Bao.
(transplanted from 2012f21d23c66179345fb26148cfbe19835b325e)
2010-04-15 20:15:40 +01:00
Tofu Linden 5c29fa9383 slightly conflicty merge from viewer-trunk, again 2010-04-12 11:57:07 +01:00
Tofu Linden c330e26db8 slightly conflicty merge from viewer-trunk, again 2010-04-12 11:57:07 +01:00
Tofu Linden f8f1e30ac3 slightly-hairy merge from viewer-trunk 2010-04-12 11:55:54 +01:00
Tofu Linden 9fbe736774 (slightly hairy) merge from viewer-hotfix 2010-04-12 11:03:16 +01:00
Xiaohong Bao 0dee7a3ece debug code for EXT-6791: Intel 965 Crash in glCopyTexSubImage2D. 2010-04-09 22:02:32 -06:00
Tofu Linden 61774546f0 HUGE merge from viewer-trunk. Many conflicts resolved. 2010-03-30 13:15:36 +01:00
Tofu Linden 6acaa5fe30 If the EXT-5854 fix is correct, this assert no longer makes sense. 2010-03-26 08:54:58 +00:00
Xiaohong Bao 6f179fc6ac fix for EXT-5854:Unable to Pay Object That Features Transparant (alpha) Texture. 2010-03-25 17:21:39 -06:00
Tofu Linden 8bafcc0491 EXT-5553 improve alpha mask ('fast alpha') heuristic
rev'd by davep
2010-02-19 09:45:30 +00:00
Tofu Linden 45529e8cad EXT-5553 improve alpha mask ('fast alpha') heuristic
rev'd by davep
2010-02-19 09:45:30 +00:00
Tofu Linden 93b74186a3 EXT-5553 improve alpha mask ('fast alpha') heuristic
rev'd by davep
2010-02-19 09:45:30 +00:00
Tofu Linden 9b410e89c3 EXT-4388 Crash in octree line segment intersection code
Yet more sanitization - whew.
2010-02-01 12:02:11 +00:00
Tofu Linden e70d7fca4b CID-155
Checker: OVERRUN_DYNAMIC
Function: LLImageGL::updatePickMask(int, int, const unsigned char *)
File: /indra/llrender/llimagegl.cpp

not a bug, AFAICT.
2010-01-27 14:04:02 -08:00
Tofu Linden b00813ae3c EXT-4388 Crash in octree line segment intersection code
a more complete fix and some sanity to prevent recurrance of a similar problem.

reviewed by bao!
2010-01-25 16:35:50 -08:00
Tofu Linden 417f0ede41 EXT-4388 Crash in octree line segment intersection code
(more accurately, it was - I believe - reading over the end of a buffer in the pick-mask lookup)

reviewed by qarl.
2010-01-20 15:59:26 -08:00
Tofu Linden 4c91f45448 Clean up the llimage init-ordering and header comments, to make it clearer when we miss initializing a member. No semantic change. 2010-01-19 12:58:49 -08:00
Tofu Linden 98cc236503 Backed out changeset a62bf7c0af21
Backing out this merge that I pushed (prematurely) to the wrong place.
2010-08-24 18:44:39 +01:00
Xiaohong Bao 35e200881c merge QAR-1829: texture pipeline branch in viewer-2.0.0.3 2009-11-06 06:52:24 +00: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
David Parks 536e38ad51 Merging render-pipeline-6-qa-2 into viewer-2
Self reviewed.
2009-09-22 11:11:45 +00:00
Monroe Williams 745845f799 svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910
svn merge -r 129913:131718 svn+ssh://svn.lindenlab.com/svn/linden/branches/pluginapi/pluginapi_05

Some branch shenannigans in the pluginapi_05 branch caused this to become a two-part merge.
2009-08-27 19:00:18 +00:00
Richard Nelson 138bf11322 merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3
DEV-11254 DEV-11254 DEV-2003: DEV-21567 DEV-37301 EXT-104 EXT-138 EXT-217 EXT-256 EXT-259 EXT-259 EXT-328 EXT-348 EXT-386 EXT-399 EXT-403 EXT-460 EXT-492 EXT-492 EXT-531 EXT-537 EXT-684

improved text editor (handles multiple fonts simultaneously as well as inline widgets)
2009-08-24 20:04:52 +00:00