Commit Graph

233 Commits (8f892d0f36fda170a5cecf0aea89887d6d0e45ef)

Author SHA1 Message Date
Monroe Linden 9cc91c42d0 Updated mac llqtwebkit build.
This was built from:

 https://hg.lindenlab.com/monroe/llqtwebkit-4.6/changeset/e0ddcd1c1a5b/

and should fix DEV-44423 (Media fonts are incorrect and ads don't load for qq.com) for the mac.
2009-12-18 16:59:50 -08:00
skolb d5b53eb483 Merge viewer 2 into media 2009-12-18 10:54:16 -08:00
Monroe Linden 252ccc48a0 New mac llqtwebkit built from revision 3e60e0d929ff in hg.lindenlab.com/monroe/llqtwebkit-4.6 .
I believe this should fix the following issues:

DEV-44406 (login screen occasionally remains black/grey with no background image)
DEV-44449 (Mac webkit will not navigate to certain sites)
2009-12-17 17:11:05 -08:00
Tofu Linden e75242fd56 Rebuild linux qt+llqtwebkit.
DEV-44461 	linux qt/webkit rebuild again - girish snap 2009-12-17
DEV-44368 	Linux MoaP viewer sees a blank 404 page on secondlife.com
2009-12-17 16:48:04 -08:00
Tofu Linden 8128ede6ff DEV-43972 breed a good openal for voice+audio 2009-12-16 14:21:55 -08:00
Monroe Linden c9a284fc69 Updated llqtwebkit 4.6 build, with link-target and cookie-saving patches applied. 2009-12-15 17:48:52 -08:00
callum b7747a815f Merge with tip before push 2009-12-15 17:53:03 -08:00
callum f923f896bc client changes to work with new version of Qt (4.6) and to do some cleanup at plugin exit so that cookies more betterer than what they did before. 2009-12-15 17:50:16 -08:00
Monroe Linden 1f7bf92168 New mac build of llqtwebkit.
This build is based on the following:

http://bitbucket.org/girish/llqtwebkit-4.6/
	revision 08c337619f50
	local change: comment out the definition of qt_sendSpontaneousEvent() in llembeddedbrowserwindow.cpp

git://gitorious.org/~girish/qt/girishs-qt.git
	branch lindenqt
	revision b4820037eac5c52d44df99ec37a50edd1796c897
2009-12-15 12:41:20 -08:00
Tofu Linden 27da9502d4 Update vivox sdk to 3.0.0006.7714 2009-12-08 12:29:44 -08:00
Tofu Linden 25a773d79c DEV-43896 solve render-pipeline linux mesh gzopen64 problem
I'm committing here instead of to render-pipeline because this seems like a change that it makes sense to give a workout in trunk.
2009-12-08 11:39:44 -08:00
Nat Goodspeed fde12f0204 DEV-43463: use fixed Boost package on Windows 2009-12-04 17:32:09 -05:00
Nat Goodspeed 5fd2938da8 Merge with recent viewer-2-0 2009-12-03 09:17:51 -08:00
Nat Goodspeed 91dd8b2371 Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/ 2009-12-03 10:38:26 -05:00
Nat Goodspeed 51c91a86e6 DEV-43463: update Boost for linux, linux64 too 2009-12-02 09:32:13 -08:00
Nat Goodspeed b626783d14 DEV-43463: update Boost package with fix for stack corruption bug 2009-12-02 12:15:52 -05:00
callum fd74ba5467 Merge to tip 2009-11-24 14:36:57 -08:00
callum b0a31eaaee References a new version of LLQtWebKit - still based on Qt 4.5.2
Also includes a newer version of OpenSSL (0.9.8l)
2009-11-24 14:33:52 -08:00
Monroe Linden fa88f41ccc Rebuild of llqtwebkit for mac, as of this revision:
https://bitbucket.org/lindenlab/llqtwebkit/changeset/4d51abc23397/
2009-11-24 13:41:57 -08:00
Tofu Linden ac325092cd Rebuild linux llqtwebkit/qt with -fno-stack-protector for better runtime compatibility.
I hope.
2009-11-17 16:46:52 +00:00
brad kittenbrink 6e7d131e58 Fix for EXT-2529,Windows error: "application configuration is incorrect."
Fixed by implementing DEV-41250 and integrating merov's DEV-31329 "curl crashers"
work into viewer-2-0.
2009-11-16 19:06:44 -05:00
Tofu Linden e363a2798a upgrade vivox v3 sdk to 3.0.0006.7653 2009-11-26 14:27:07 +00:00
Tofu Linden 1942e607f8 merge. 2009-11-26 09:47:00 +00:00
Tofu Linden de92d5ce32 re-upgrade to vivox v3 sdk here. 2009-11-23 17:57:25 +00:00
callum 0eaf4b2bb2 Fix for DEV-42546 (QuickTime plugin crashes a lot) 2009-11-10 15:44:56 -08:00
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
brad kittenbrink a7efd0d8dd Merged in viewer-2.0.0-3 changes up through r129050. Boost got clobbered so I'll need to rebuild that, plus a couple other minor clenaups. 2009-07-30 19:39:08 -07:00
Nat Goodspeed 1e1a38d574 DEV-34837: Improve Mac support for LLCOMMON_LINK_SHARED.
Update Mac apr_suite package, introducing libapr-1.0.3.7.dylib and
libaprutil-1.0.3.8.dylib. We want to use dynamic APR libraries, but
libllcommon.dylib isn't allowed to depend on .so libraries: must be .dylibs
themselves.
Tweak APR.cmake to reference the aforementioned .dylibs when on Mac with
LLCOMMON_LINK_SHARED set. Eliminate some redundancy in Windows section.
For .dylibs, RunBuildTest.cmake must set DYLD_LIBRARY_PATH: LD_LIBRARY_PATH
only affects search for .so files.

PENDING:
CMake dependencies broken? With LLCOMMON_LINK_SHARED on, it seems we need to
build libllcommon.dylib explicitly before full build can succeed.
This snapshot does NOT yet copy the llcommon, apr or aprutil dylibs into the
app bundle.
2009-07-30 18:51:17 -04:00
brad kittenbrink 935712fc5b New package of xmlrpc-epi that actually links to the expat libs we ship. I have no idea how this has worked for so long. 2009-07-27 18:06:35 -07:00
Mark Palange 0274c1f2b1 Merged work for DEV-2066 (and formerly QAR-1538) in Viewer 2.
merged all changes, post copy, from the following branches:
linden/brachnes/enable-o-v
user/cg/qar-1538
user/mani/viewer2-enable-o-v
2009-07-16 17:54:58 +00:00
Adam Moss 541e0b1dfc cherrypicking the fix for linux startup issue DEV-33209 - the bug has percolated
around for so long without the fix that I can't stand it any longer.

svn merge -c123659
svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-viewer/maint-viewer-15-sandbox-3
2009-07-07 10:23:45 +00:00
James Cook d6101558a1 Merge xui-army-5 to viewer-2, includes layout, art, and color changes, also UI color refactoring and new FreeType font library on Linux.
svn merge -r126038:126164 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/xui-army-5
2009-07-06 21:58:04 +00:00
brad kittenbrink 71405876b2 Updated apr_suite library package to include dll versions of apr as well. 2009-07-02 12:56:55 -04:00
Bryan O'Sullivan 7aec119d84 Merge with SVN login-api-3 branch 2009-06-25 11:12:51 -07:00
Nat Goodspeed 0ea53e0de4 QAR-1619: make assemblies/3rd_party_libs/linux64/boost.txt reference .a libs
that are actually present.
Update linux and linux64 boost tarballs with previous Windows, Mac patch.
2009-06-23 20:51:27 +00:00
Bryan O'Sullivan d01e9ccb75 Fix up some mismerged pieces of install.xml 2009-06-22 16:27:24 -07:00
Steven Bennetts 9ec432034d merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
ignore-dead-branch
2009-06-21 08:04:56 +00:00
Brad Kittenbrink 087bd26553 Merge of QAR-1383 event-system-7 into trunk.
svn merge -r 121797:121853 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge-event-system-7
2009-06-04 16:24:21 +00:00
Nat Goodspeed de55fd54bf DEV-32777: update Boost.Coroutine for Windows too 2009-06-03 21:46:25 +00:00
Nat Goodspeed 285613b892 DEV-32777: Introduce LLCoros, an LLSingleton registry of named coroutine
instances. LLCoros::launch() intends to address three issues:
- ownership of coroutine instance
- cleanup of coroutine instance when it terminates
- central place to twiddle MSVC optimizations to bypass DEV-32777 crash.
Initially coded on Mac; will address the third bullet on Windows.
Adapt listenerNameForCoro() to consult LLCoros::getName() if applicable.
Change LLLogin::Impl::connect() to use LLCoros::launch().
LLCoros::getName() relies on patch to boost::coroutines::coroutine::self to
introduce get_id().
2009-06-03 21:38:21 +00:00
Adam Moss 9dfe0ca9a0 svn merge -r121194:121210
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.onetwo-merge-1

QAR-1531 viewer 1.23rc1+1.23rc2 merge to trunk
2009-05-22 09:58:47 +00:00
Bryan O'Sullivan fb309e781e Windows: make dbghelp.dll an installable package
Reviewed by Mani.
2009-05-20 22:25:32 +00:00
Nat Goodspeed dc93462991 svn merge -r113003:119136 svn+ssh://svn.lindenlab.com/svn/linden/branches/login-api/login-api-2 svn+ssh://svn.lindenlab.com/svn/linden/branches/login-api/login-api-3 2009-05-11 20:05:46 +00:00
Nat Goodspeed 3800c0df91 svn merge -r114679:114681 svn+ssh://svn.lindenlab.com/svn/linden/branches/event-system/event-system-7 svn+ssh://svn.lindenlab.com/svn/linden/branches/event-system/event-system-8 2009-05-08 21:08:08 +00:00
Adam Moss cc92525b0d QAR-1476 Combo-merge to trunk: Viewer 1.23 RC0 and Simulator 1.26.3
svn merge -r118927:118939
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.0-merge-2-combo-QAR-1476

this is a composite of...

svn merge -r115088:118182
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer_1-23
conflicts resolved:
C      doc/contributions.txt
C      indra/llaudio/audioengine.cpp
C      indra/newview/CMakeLists.txt
C      indra/newview/llfloaterlandholdings.cpp
C      indra/newview/llpaneldirbrowser.cpp
C      indra/newview/llpanelgrouplandmoney.cpp
C      indra/newview/llpreviewscript.cpp
C      indra/newview/llviewermenu.cpp
C      indra/newview/skins/default/xui/en-us/notifications.xml

and...

svn merge -r116937:118673
svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26
minor-to-trivial conflicts resolved:
C      indra/llcommon/llversionserver.h
C      indra/newsim/llrezdata.cpp
C      indra/newsim/llstate.cpp
C      indra/upgrade/schema_version/sequence/3/index_log_paypal.sql
2009-05-04 17:43:26 +00:00
Christian Goetze 4bcbf33422 svn merge -r118008:118374 svn+ssh://svn.lindenlab.com/svn/linden/branches/cg/viewer-etch-1
QAR-1459 etch builds enabled
2009-04-30 06:52:38 +00:00
Adam Moss b01c75cb42 svn merge -r117314:117337
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/mv13a-merge-1

QAR-1343 maint-viewer-13a+libcurlexploitfix-3-3 combo merge
2009-04-16 23:45:35 +00:00
Bryan O'Sullivan 868250bdd7 Turn the artwork tree back into a downloaded package, but revision-control
the XML files.
2009-04-15 16:36:50 +00:00
Bryan O'Sullivan 7966bd9b67 Re-add character data. 2009-04-14 20:04:08 +00:00
Christian Goetze 72c5076d6e Working around DEV-30401 by yanking the etch 32bit build code until the viewer also builds on etch 2009-04-10 01:15:27 +00:00
Bryan O'Sullivan 1aca3ff6f5 Get 32-bit builds going on 64-bit Debian Etch.
Reviewed by Brad.
2009-04-09 18:05:56 +00:00
Bryan O'Sullivan a8525c90b9 Move some viewer artwork into a downloadable package.
These files haven't been touched in years.

Reviewed by Richard.
2009-03-31 20:37:06 +00:00
Monroe Williams 5dfd435872 svn merge -r 114639:114640 svn+ssh://svn.lindenlab.com/svn/linden/branches/qar-1361
Merging in QAR-1361.
2009-03-19 19:18:07 +00:00
Monroe Williams dd437009e8 svn merge -r 113014:113017 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge-QAR-1323
Merging in QAR-1323.
2009-02-27 21:01:19 +00:00
Bryan O'Sullivan c72df34847 Drop linux32 support from install.xml and install.py, since unused and untested 2009-02-24 21:24:36 +00:00
Brad Kittenbrink abdc99f21b Merge of QAR-1267 to trunk. This was a combo merge of QAR-1175 (maint-render-9) and QAR-1236 (dll-msvcrt-2)
svn merge -r 109838:112264 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-9-merge-r109833
2009-02-18 21:10:16 +00:00
Adam Moss e188badaf2 QAR-1177 maint-viewer-12 + uploadfees-viewer combo mergeme
svn merge -r108355:109316
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/maint-viewer-12-uploadfees-qa108314

Whew.
2009-02-03 17:56:26 +00:00
Andrew Meadows 15a6d273cc svn merge -r108142:108148 svn+ssh://svn.lindenlab.com/svn/linden/qa/maint-server/maint-server-5-r108113 2009-01-17 01:29:45 +00:00
Andrew Meadows ce5f06ab76 Changed 'openal' to 'openal-soft' to be more correct.
Added a linux64 version of openal-soft for the etch build.
Not reviewed.
2008-12-19 23:59:53 +00:00
Aaron Brashears 0a5c9731fd Result of svn merge -r105061:106057 svn+ssh://svn/svn/user/phoenix/upgrade-tut into trunk. QAR-1074 2008-12-18 01:30:09 +00:00
Robert Knop 189599b6ff Merging from server/server-1.25 back to trunk.
svn merge -r99446:104838 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.25

Conflicts resolved by Prospero, except for one scary conflict in
SendConfirmationEmail.php which was resolved by jarv.
2008-12-04 22:36:34 +00:00
Adam Moss fd46865a50 QAR-1040 maint-viewer-11 + OpenAL combo mergeme
svn merge -c104451
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/openal-maint-viewer-11-combo-r104448
2008-12-02 20:35:40 +00:00
James Cook 2a44e81675 QAR-1018 Lightweight Windows Setup App (windows-setup-3). svn merge -r102882:102883 svn+ssh://svn.lindenlab.com/svn/linden/branches/windows-setup/windows-setup-3-merge 2008-11-19 23:26:29 +00:00
Adam Moss a879e13055 svn merge -c102054
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/morejoy-2-r102015

QAR-1016 joystick+spacenav improvements MERGE
2008-11-12 20:28:24 +00:00
Kyle Ambroff c95cd6f6b3 svn merge -r99735:99739 svn+ssh://svn.lindenlab.com/svn/linden/branches/giab/giab-11 --> release
Rebuilt x86_64 libOSMesa16, which wasn't really compiled with 16
bit/channel support, and was causing mapserver to crash on startup. Only
affects x86_64 builds.
2008-10-16 23:35:13 +00:00
Andrew Meadows 591382f613 Modified the hkDebugMemory.h file: OutputDebugString(s) ==> OutputDebugStringA(s) to prevent a bad cast error in the windows debug build of the simulator.
I packaged up a new havok-4.6.1 windows binary and modified the install.xml file.
2008-10-10 18:05:43 +00:00
Andrew Meadows 5f3875018e svn merge -r99056:99248 svn+ssh://svn.lindenlab.com/svn/linden/branches/andrew/gcc-4-003-for-merge 2008-10-10 16:04:02 +00:00
Steven Bennetts d725e5b240 QAR-872 Viewer 1.21 RC 3
merge viewer_1-21 96116-97380 -> release
2008-09-29 19:14:50 +00:00
Steven Bennetts afe61eb994 QAR-849 merge maint-viewer-10-merge 96838-97237 -> release 2008-09-23 01:53:11 +00:00
Kyle Ambroff a8b7f114e7 Fixed broken libmono-windows package url in install.xml 2008-09-16 19:56:34 +00:00
Kyle Ambroff 4fbe0bede5 Uploaded libmono-windows package to S3, and updated URI in install.xml. 2008-09-16 19:45:36 +00:00
Jim Purbrick c4d1e19668 * Updated install.xml to reference fixed mono lib.
Not reviewed
2008-09-03 14:47:19 +00:00
Kyle Ambroff 52108f7472 svn merge -r94413:95195 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-24-Server -> release
Merging various fixes from 1.24 Server.

From 1.23:
* DEV-18957: SCUT: Enable test.py to run tests agains a grid database

From 1.24, the UPCOMING production branch:
* DEV-18934 VWR-8519: 1.21 nightly:  World > Region/Estate > Debug > Get Top Scripts crashes viewer
* Sanity checking build settings before packaging binaries
* DEV-19810 Updated libmono on linux with support for signal chaining
* Remove gdb references to gPumpFile and gPumpLine in crash_reporter.py
* DEV-19397: Changed the signature for remote_data to for Mono scripts
* DEV-19396: Steal signal handlers back from Mono on error.
* DEV-19396: attach mono thread if necessary during writeState
* DEV-19396: Allow mono to handle managed SEGV signals during emergency save
* DEV-19396: Disable GC while writing the simstate during a crash
* DEV-19550: Make viewer crash reporter handle different binary debug file names
* Defensively protect against responders not being in list and give a warning rather than crash.
* Fix simulator crash in shutdown error handling that also causes error stacks to go unreported
* DEV-19752 QAR-834 Remove Community Standards window from startup. Set the "critical message" name on agni to NULL.
* Minor traceback fixes in backbone for multiagentchat
* Removed some mono debug spam
* DEV-19239: Group members receives an error upon opening group chat if join group chat was disabled then reenabled.
* DEV-19809 Harden llGetNextEmail to bad params
* DEV-17967 fixed null string and keys passing to lib funcs
* Several small fixes for farm deploy tools and automated build system
* Sync indra/agent/auth.py with interop-5 branch, and update status codes
2008-08-29 09:20:43 +00:00
Kyle Ambroff 172cd4d530 svn merge -r95358 svn+ssh://svn.lindenlab.com/svn/linden/branches/dev-19740-fix
Reverting improperly built kdu package from install.xml to fix DEV-19740.
2008-08-29 01:00:19 +00:00
Steven Bennetts 4a6bacea0f merge viewer/viewer_1-21 94170-94770 -> release
merge viewer/viewer_1-21-0 94830-95157 -> release
Includes:
QAR-786 Sandbox buildme for viewer + server Release Notes on the wiki!
QAR-797 teleport failures (DEV-6198 / SVC-972) mergeme
2008-08-28 23:57:41 +00:00
Jennifer Leech b59caea980 - install.xml updated with versions of tarfiles which no longer contain debug lib files on linux and darwin. Files mistakenly added previously from automatically generated linux build dir (viewer-linux-i686) removed. Also some dll's mistakenly added to linux lib tarfiles removed.
- file lists in assemblies/3rd_party_libs (used for updating lib tarfiles) updated as per above
- new config files created for 'glib' library; glib files removed from gtk-atk-pango-glib filelist.  glib can be decoupled from mono, when appropriate.

- package.py help dialogue and error reporting updated for clarity.
- install.py will now output list of files installed for a package with command-line option
2008-08-19 23:21:06 +00:00
Jennifer Leech a09f7d41ef Two more tarfiles in install.xml that needed uploading to S3. Now all references to int.codex have been removed. 2008-08-12 17:11:50 +00:00
Jennifer Leech e549858b5e Moved mono libraries to S3 so that remote devs can access. Md5's are the same, just new urls in install.xml.
Resolves: DEV-19126
2008-08-12 16:53:39 +00:00
Dave Hiller 9a7d68cfce svn merge -r93014:93396 svn+ssh://svn.lindenlab.com/svn/linden/branches/mono-r93014-qar633 dataserver-is-deprecated 2008-07-31 12:15:15 +00:00
James Cook ed386ae547 merge support-featurettes-snapshot-merge-2 for QAR-754, includes:
* featurettes-4 89061:89589 (which is all of featurettes-1, -2, and -3, and part of -4)
    * gteam-showstoppers-3 91950:91951 (which is all of gteam-showstoppers-1, -2, and -3)
    * featurettes-5 92149:92150 (patch for last line of chat text not visible in chat history, DEV-17771)
    * snapshot-3 91988:91991 (which is all of snapshot-1, -2, and -3)

Merging revisions 92190-92387 of svn+ssh://svn.lindenlab.com/svn/linden/branches/support-featurettes-snapshot-merge-2 into release, respecting ancestry

* QAR-590 Merge Lock Request for Support Sprint
* QAR-627 Merge snapshot improvements
* QAR-686 Merge Lock request for Featurettes
2008-07-18 17:50:25 +00:00
Jennifer Leech d32c8825b6 svn merge -r89701:90677 svn+ssh://svn/svn/linden/branches/install-dev-binaries/s3-build -> release 2008-06-26 19:08:51 +00:00
Kyle Ambroff dc3f5ff87c svn merge -r90150:90340 svn+ssh://svn.lindenlab.com/svn/linden/branches/qar-699_combo-merge --> release
QAR-699 - Combo merge for QAR-687, QAR-637, QAR-586

 * QAR-687 - Test build with libs on S3
 * QAR-637 Test dynamic sound throttle
 * QAR-586 Test new http features branch
2008-06-21 07:39:52 +00:00
Aaron Brashears f540a70546 vpn compatible package locations. next, external dev package locations. 2008-06-13 19:44:31 +00:00
Jennifer Leech fbf15572d9 svn merge -r89258:89534 svn+ssh://svn/svn/linden/branches/install-dev-binaries/idb2-merge-buildme 2008-06-12 20:51:41 +00:00