Commit Graph

108 Commits (d181b84dfdce83d1999d086c3eda2cdc51849a11)

Author SHA1 Message Date
Steve Bennetts 4b9abdc833 Reverting OSX changes to expat from texture-pipeline merge 2009-11-06 14:51:52 -08:00
Steve Bennetts afe6350160 merge from texture-pipeline 2009-11-06 12:15:41 -08:00
Xiaohong Bao 35e200881c merge QAR-1829: texture pipeline branch in viewer-2.0.0.3 2009-11-06 06:52:24 +00:00
brad kittenbrink 8558545b74 New package of linux llqtwebkit and attempt to reenable linux viewer build. 2009-10-27 18:55:19 -04:00
callum 62e0e51b43 Merge 2009-10-23 17:08:36 -07:00
callum 3008b3fdc0 Main change is pointing install.xml for Windows to new version of LLQtWebKit that has DLLs with no manifest as per recent build change.
Tweaked bookamrks for test app too.
Finally, added fix for DEV-41392 (Home URL Preview should be next to the Home URL)
2009-10-23 16:19:04 -07:00
Monroe Linden 376deff7a3 Changes to match new version of llqtwebkit -- passing modifier keys through to most user events and using new scroll wheel event. 2009-10-23 14:28:21 -07: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
brad kittenbrink 50247533f9 Merged latest viewer/login-api with latest viewer/viewer-20 2009-10-07 17:51:28 -07:00
brad kittenbrink 146e084af3 Merged in latest svn-imports-viewer-20 changes. 2009-10-07 16:12:56 -07:00
James Cook 750f94ca69 EXT-1141 Remove one-click cursor icons from art directories. Cursor is now a hand for all one-click actions, at Erica's request. Deleted art files for Win/Mac/Linux, including repackaging the SDL binary download package. Reviewed with Kelly. 2009-10-07 00:15:11 +00:00
Steven Bennetts a7bef5bc90 Back out revisions 135028,134955,134953,134939
* Revert Vivox SDK update
2009-10-05 21:16:35 +00:00
Mark Palange (Mani) 4d53e235c2 merge of latest viewer/viewer-20 2009-10-02 10:35:42 -07:00
Mark Palange (Mani) dde2153014 merge of latest lindenlab/svn-imports-viewer-20 2009-10-01 18:19:45 -07:00
brad kittenbrink 45c053b87d Fix yet another error in building llqtwebkit.lib, this time the release lib really links only to the release CRT. 2009-10-01 14:41:57 -07:00
brad kittenbrink 0c0b59e104 New llqtwebkit package that has no embedded manifests. 2009-09-30 18:55:55 -07:00
Nat Goodspeed eca30a2262 QAR-1619: merge up to 2009-09-26 viewer/viewer-20 2009-09-30 21:42:04 -04:00
Adam Moss af39853e7c DEV-40702 update viewer2 vivox sdk to v3 2009-10-01 00:23:26 +00:00
Nat Goodspeed bc4444cd78 Merge into viewer/viewer-20 yesterday's lindenlab/svn-imports-viewer-20 2009-09-26 18:08:24 -04:00
Nat Goodspeed bd0c306752 Add pth-2.0.7-linden.txt with S3 URL for the original Pth source tarball.
Add this file to pth.txt manifest file.
Update install.xml with the URL for new pth-2.0.7-darwin-20090923.tar.bz2.
2009-09-23 12:25:44 -04:00
Adam Moss f87f9d17d2 DEV-32832 OSX: freetype 2.3.9 upgrade
My first stab at building an OSX package, I hope the results are okay; back this out if things barf.
2009-09-22 18:56:02 +00:00
brad kittenbrink b5ed4fec54 New package of zlib since I broke the name of the debug .lib. 2009-09-21 18:51:50 -04:00
brad kittenbrink 008d21eb44 New build of googlemock generated against the right CRT build to fix DLL hell. 2009-09-21 18:51:22 -04:00
brad kittenbrink 05739cf8ac Merged my recent viewer/viewer-20 + login-api merge with latest login-api including DLL hell library changes. 2009-09-18 16:33:15 -04:00
brad kittenbrink bb1d4592bd Merged latest viewer/viewer-20 into login-api. 2009-09-18 15:22:25 -04:00
brad kittenbrink 4489a018ca Merged my daggy fix to the broken curl package with later library work. 2009-09-17 20:00:58 -04:00
brad kittenbrink 9615727329 New build of windows freetype to fix CRT dll hell. This also upgrades to 2.3.9 (DEV-32831). When this merges to viewer-2.0 it should replace the build there. 2009-09-17 19:58:59 -04:00
brad kittenbrink 5b98de7a4b Fix for broken jpeglib package I just uploaded. 2009-09-17 19:49:10 -04:00
brad kittenbrink 8ae5de0e31 Fix for broken windows curl package I just built. Still version 7.19.6 as per DEV-28321. 2009-09-17 19:45:00 -04:00
brad kittenbrink 8e8a5bd24f Rebuilt the following libs to fix CRT dll hell: ares expat jpeglib libpng ndofdev xmlrpc-epi zlib 2009-09-17 17:41:16 -04:00
brad kittenbrink c2623d5ab4 Rebuilding of windows curl to fix CRT dll hell. Also upgrading to 7.19.6 to avoid the need for special patching (see DEV-28321 vulnerability). 2009-09-17 16:24:16 -04:00
brad kittenbrink 33130868b2 Rebuild windows apr to fix CRT dll hell. Also upgrading to apr-1.3.8/apr-util-1.3.9 in the process for DEV-38196 vulnerability. 2009-09-17 16:05:02 -04:00
brad kittenbrink a84b98e31e Rebuilt windows boost for CRT version DLL hell, upgrading to 1.39 in the process. 2009-09-17 15:51:29 -04:00
Bryan O'Sullivan a997e131d4 Merge with SVN viewer-2.0.0-3 branch 2009-09-09 17:10:06 -07:00
Brad Kittenbrink 5154f4e9d2 Reenable freetype-2.3.9 for win32 (DEV-32831)
svn merge -c 131881 .

parabuild succeeded building this in branches/brad/freetype-2.3.9-upgrade/ so it had better work here...
2009-09-09 18:09:03 +00:00
brad kittenbrink bae94e4340 Merged login-api with viewer-2.0.0-3 up through r132290. 2009-09-01 12:21:51 -04:00
Bryan O'Sullivan f4f02f0f34 Fix up some post-merge breakage. 2009-08-31 15:09:13 -07:00
Adam Moss 158946668a svn merge -r130875:131962 svn+ssh://svn.lindenlab.com/svn/linden/branches/pluginapi/pluginapi_05_newllqtwebkit
DEV-31438 Rename LLMozLib (Qt/WebKit) to something else - LLQtWebKit
2009-08-31 17:16:21 +00:00
brad kittenbrink d020dae7b9 Merged latest login-api with latest viewer-2.0.0-3 up through plugin-api-05 merge (r131929).
Some minor post-merge cleanups still required.
2009-08-27 16:25:02 -04: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
Adam Moss 71344b233d svn merge -c-131881 .
back-out DEV-32831

it annoys install.py but goodness knows why.
2009-08-27 08:51:31 +00:00
Adam Moss dcfb520c56 DEV-32831 Win32: freetype 2.3.9 upgrade
patch by brad.
2009-08-27 08:08:57 +00:00
Nat Goodspeed 2d32f4779c DEV-34837: The problem with prepackaging library headers is that changes in
different branches must be manually merged. Here I've applied the Linden patch
to boost::coroutines found in
http://svn.lindenlab.com/svn/lindenlib/trunk/boost_1_34_1/boost-coroutine-linden.patch
and rebuilt the Mac boost package.
2009-08-05 21:36:32 -04:00
Nat Goodspeed 07129bf928 Merge recent changes 2009-08-05 16:10:15 -04:00
Nat Goodspeed 03ebc43132 DEV-34837: Remove dependency on Leopard-only /usr/local/lib/libexpat.0.1.0.dylib.
On Mac, add libexpat[.0.5.0].dylib to apr_suite package. Update
libapr-1[.0.3.7].dylib and libaprutil-1[.0.3.8].dylib with versions that
reference this expat. Make viewer_manifiest.py copy expat dylib to app bundle.
2009-08-05 16:08:17 -04:00
brad kittenbrink 945656147c New linux packages for linux and linux64.
Combines the Boost.Coroutine changes in old login-api with the -Woverloaded-virtuals changes in viewer-2.0.0-3.
I could not verify the 64 bit build for now, as other breakage is getting in the way...
2009-08-04 14:29:30 -07:00
brad kittenbrink 134f394c25 New boost packages for windows and os x.
Combines the Boost.Coroutine changes in old login-api with the -Woverloaded-virtuals changes in viewer-2.0.0-3.
2009-08-03 18:50:35 -07:00
brad kittenbrink d35cd27796 Merged Nat and Palmers latest build fixes with the big viewer-2.0.0-3/login-api merge work (changeset 486d51877332) 2009-08-03 09:54:44 -07:00
Nat Goodspeed 084983485f DEV-34837: update Mac apr_suite package so that each of the .dylib files
self-identifies as @executable_path/../Resources/filename. This allows the SL
executable to find it at runtime in its official place in the app bundle.
Change viewer_manifest.py to copy libllcommon.dylib, libapr*.dylib to app
bundle's Resources subdir.
2009-07-31 13:26:24 -04:00