Commit Graph

2235 Commits (2aa981ac23bbdf2fd609e04434179be0cfec79ce)

Author SHA1 Message Date
Bryan O'Sullivan fa11307d61 QAR-842 / Port Mac build borkage fix to release 2008-09-02 20:54:30 +00:00
Bryan O'Sullivan 4cccb812de libpng needs linking against zlib 2008-08-30 03:55:11 +00:00
Bryan O'Sullivan 818535576c Switch more libraries over to target_link_libraries 2008-08-29 22:16:44 +00:00
Bryan O'Sullivan 1496c3d0ee Switch llimage and llxml to target_link_libraries 2008-08-29 21:46:30 +00:00
Bryan O'Sullivan eb65aca9f8 Use target_link_libraries for llaudio 2008-08-29 21:26:27 +00:00
Bryan O'Sullivan 8279f93f4d Use target_link_libraries for llcommon 2008-08-29 21:18:49 +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
James Cook ac4766d435 Revert last change to develop.py because it breaks manually passing -DPACKAGE:BOOL=ON on the command line.
Merging revisions 95284-95283 of svn+ssh://svn.lindenlab.com/svn/linden/release into E:\release, respecting ancestry
2008-08-28 18:01:27 +00:00
James Cook 9dfb138517 DEV-19836 Add --package and --viewer-only options to develop.py. Ported from maint-viewer. OK by CG.
Merging revisions 95145-95146,95281-95282 of svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-viewer/maint-viewer-10 into E:\release, respecting ancestry
2008-08-28 16:54:47 +00:00
Kartic Krishnamurthy 518ff7fcfa QAR-702 - Merge DPO-14 to Release
svn merge -r94899:95259 svn+ssh://svn/svn/linden/branches/dpo-lock-qar-702 .

QA Tested : Mick

I understand that the dataserver-is-deprecated - kk
2008-08-28 06:17:28 +00:00
Kyle Ambroff cff714056a One-liner fix for indra.base.llsd.parse_datestr. Ensure that seconds are always 2 digits if there are no microseconds. Updated unit tests to enforce this. Reviewed by James. 2008-08-27 22:49:10 +00:00
Kelly Washington 2336b76f0d merge -r94900 linden/branches/kelly/qar-825 to linden/release
QAR-825 DEV-18489 Event poll is brittle and doesn't parse status correctly
2008-08-26 17:15:20 +00:00
Brian McGroarty 0ae3512454 Fix gcc4 with proper Linden-canonical struct definitions 2008-08-25 15:24:10 +00:00
Kartic Krishnamurthy cb7abfd595 Master QAR-807 passed.
Sub-QARs
1. QAR-765 Rad chilies 04 to Release
2. QAR-799 Merge PHP Framework 4 changes to release
3. QAR-801 Merge Buildme for startlocationfix

svn merge -r93906:94028 svn+ssh://svn/svn/linden/branches/combo-merge-qar-765-799 .
2008-08-21 22:09:21 +00:00
Brian McGroarty 30638bb110 Additional gcc warnings - no code effect 2008-08-21 13:22:47 +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
Paul Oppenheim 728e2c6e70 fix for DEV-18488 - remove optimization for RelWithDebInfo for Darwin builds. Not reviewed, mailed to cmake@. Pretty minor, not destructive. Also removing test lldatabase_tut on mac for DEV-14371 until theres a sane way to do connection checking. I could be wrong on this one. 2008-08-18 08:09:52 +00:00
Josh Bell 6931f129a2 svn merge -r 93885:94413 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-24-Server --> release
From 1.23:
* DEV-18788 SEC-136: Avatars Link as links instead of sits
* DEV-18754 Instant simulator crash using llUnescapeURL
* QAR-780 Test the viewer crash reporter in branch crashlogger_vc8@92961
* login.cgi foo by billc
* DEV-18732 QA the flow for first landing location change: Help Island + Browser Tutorial
* Added email notification of crashloganalyzer.py failures
* QAR-802 / DEV-19069 - merge maint-webds-1-23 to Branch_1-23-Server
* removed obsolete start-location code

Backport fixes from UPCOMING production branch:
* DEV-19031 Crash in new Mono code when one object rezzes another with active script
* DEV-19050 SVC-2745: llSetLinkPrimitiveParams misbehaving on 1.23 server if avatar is near ground
* DEV-16129 Break getStartLocation timeout apart from rest of teleport request failure metric
* DEV-14270 Add a column to tp metric to differentiate teleports, local teleports, and region_crossings
* DEV-18965 Unable to save scripts when running a sim on windows.
* DEV-17376 some region links in Search teleport you without warning
* DEV-17796 Sim performance decreases a lot with rezzing physical objects
* DEV-19142 SVC-2773: Mono Beta: Script editor "Save" does not save scripts containing syntax errors
* Switched serialized data to a vector instead of a GCed Mono array
* Made update of cache explicit
* Added heartbeats during long derezzes and deletes to stop the launcher killing the sim
* DEV-15010 include agent_id in search metrics
* DEV-15011 Search metrics not including non 'CLASSIFIED' and 'PLACE' search types
* DEV-19288 Broken webservices in 1.24
* DEV-18957 : SCUT : Enable test.py to run tests again a grid database
* Remove leading whitespace to work around bug DEV - 19276 (this is NOT a fix for that bug)

dataserver-is-deprecated-yo
2008-08-14 22:06:38 +00:00
Christian Goetze 1a4b846558 Fixed DEV-19210 - reviewed by josh 2008-08-13 23:49:05 +00:00
Christian Goetze 63d6bb3284 Add caching of mysql database store, fixed problem with ignored VIEWER_LOGIN_CHANNEL, removed debug output from version manager addition code. 2008-08-13 21:12:58 +00:00
Steven Bennetts b9b4a4d934 QAR-782 Merge featurettes batch #2
merge featurettes-6-merge-2 -> release
dataserver-is-deprecated
2008-08-13 19:37:05 +00:00
Christian Goetze 0a3b9e8e14 Revert excess changes from previous commit - I hate it when that happens. 2008-08-12 17:54:40 +00:00
Christian Goetze 9332840237 svn -c 94141 merge svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer-merge-1 2008-08-12 17:52:55 +00:00
Steven Bennetts 80be4c1d2d QAR-767 Combined maint-render-7 and maint-viewer-9 merge
merge release@93398 viewer-merge-1@94007 -> release
dataserver-is-deprecated
2008-08-12 17:29:50 +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
Eric Tulla 943db8fc6b Added the latest directx sdk release (June 2008) to the list that cmake searches for.
-Reviewed by bos
2008-08-08 22:14:53 +00:00
Brian McGroarty 8c7ac40358 missing contributions entry 2008-08-08 16:12:53 +00:00
Brian McGroarty e2992ce8bb DEV-17171 VWR-7831: 1.20.10 fails to compile with gcc 4.1 -- (minor syntactical issue) 2008-08-08 16:11:26 +00:00
Kelly Washington 748822967f DEV-18965 Unable to save scripts when running a sim on windows.
Hardcoded assumptions that the services were offered on the same host as the region which isn't true for windows development.
NOT TESTED WITH A LINUX SIMULATOR
2008-08-07 22:21:05 +00:00
Josh Bell 3fd18de450 svn merge -r 93444:93885 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-24-Server --> release
Backport fixes from UPCOMING production branch:

* Fixed gdb/simulator statistics bucket index: "bucket[1]" to "bucket[2]"
* Updated eventlet and mulib external revisions
* Various deploy script tweaks
* DEV-17796 Sim performance decreases a lot with rezzing physical objects
* DEV-18900 Turn off the LL_DEBUG_PUMPS code
* DEV-18896 SVC-2738: Mono Beta: Newer LSL functions will not compile under Mono
* DEV-18825 make install_indra.py produce the /local/www/login.GRID.lindenlab.com tree/symlinks
* DEV-18826 make install_indra.py produce the /local/www/xmlrpc.*.com tree/symlinks
* DEV-18188 View:Property Lines and View:Land Owners shows everything as group owned even if it's not under 1.23.2.92647
* DEV-18723 develop.py -t Release build server should build everything needed to succesfully farm stage a server
* DEV-18316 Simulator crashing on exit due to bad use of global pointer caching
2008-08-07 18:54:13 +00:00
Bryan O'Sullivan 3b3e122489 DEV-16182 / Improve error message if subcommand option unrecognised
Self-reviewed.
2008-08-04 22:33:28 +00:00
Bryan O'Sullivan b82b614d3c DEV-18513: Simplify use of Boost libraries on OS X.
Self-reviewed.
2008-07-31 20:53:33 +00:00
Bryan O'Sullivan 7c2d8fc8f8 Bump minimum cmake version to 2.4.8. 2008-07-31 18:13:05 +00:00
Bryan O'Sullivan c945c6eba8 If we need Mono, but don't find it, then fail early
Self-reviewed.
2008-07-31 17:45:03 +00:00
Bryan O'Sullivan 76a08a7884 DEV-18513 - Don't fail if we have no debug FMOD libraries
Reviewed by Poppy.
2008-07-31 17:21:46 +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
Josh Bell f0f2a41691 svn merge -r 93027:93128 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-23-Server --> release
Backport fixes from production branch

* DEV-8282  integrated alt check with durls white list code
* Fix for memory stomping due to deleting vector as scalars
* DEV-16904 Email message shows incorrect owner when inventory item is sent to offline resident from scripted object inworld
2008-07-28 20:35:24 +00:00
Kyle McKay b4ed6bb95c Explicitly mark the generated files with the GENERATED property to make sure CMake handles them correctly 2008-07-27 00:29:30 +00:00
Kyle McKay f2c327be96 Remainder of CMake 2.6.0 compatibility fixes. CMake 2.4.7/2.4.8 or 2.6.0 can now be used for Mac builds. 2008-07-26 22:56:53 +00:00
Kyle McKay 1bb86fb755 CMake updates:
1. Initial compatibility with CMake 2.6 (verified on Mac OS X, other platforms may need more work)
2. Ability to more easily debug problems fetching prebuilt libraries (./develop.py configure -DDEBUG_PREBUILT=1)
3. Compatibility with Mac OS X MacPorts/Fink installations by trying to find and use system python executable first
2008-07-26 18:21:31 +00:00
Christian Goetze e79f766f57 Tweak output of test_all_platforms.py 2008-07-25 20:21:32 +00:00
Josh Bell 75b2af6df8 svn merge -r 92383:92992 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-23-Server --> release
Backport fixes and other cruft from the production branch:
* DEV-16158 make_deploy_group.py queries simulator_standby table not region conductor
* DEV-17891 SEC-118: Classifieds can be created with any amount paid for L$50
* QAR-745 Test rez object security break - SEC-104 (and possibly SEC-115)
* DEV-18161 allow_negative_balance parameter for sink operation so fraud team can dock the accounts of people who bought bad L$
* DEV-18217 Crash rate >10x higher in 1.23.2 than 1.22.4
* DEV-15570 Enable Improved IM web service
* add auth.py from interop-5 (for interop login testing on preview grid)

did-you-know-that-dataserver-is-deprecated?
2008-07-25 00:15:56 +00:00
Adam Moss 108b20b800 DEV-18322 current trunk viewer doesn't start
remove erroneous texture entries which were probably the result of a
mismerge.

approved by steve & james.
2008-07-24 17:53:51 +00:00
Karl Steifvater 52562e2e66 svn merge -r92720:92721 svn+ssh://svn.lindenlab.com/svn/linden/branches/uv-picking-merge
QAR-698 / DEV-9985 add touch "position" information to touch-events in LSL
2008-07-23 21:20:19 +00:00
Brian McGroarty bc39ad916e DEV-18283 Remove nonsense mem-checking debug code 2008-07-23 17:23:22 +00:00
Josh Bell 35b4a91129 svn merge -r92710:92709 svn+ssh://svn.lindenlab.com/svn/linden/release --> release
Undo r92710 (for QAR-698) - went straight into release instead of a side branch for validation.
2008-07-22 20:55:02 +00:00
Karl Steifvater df4f20d4f5 merge uv-picking branch.
svn merge -r92602:92632 svn+ssh://svn.lindenlab.com/svn/linden/branches/uv-picking-4
2008-07-22 20:12:37 +00:00