Commit Graph

10776 Commits (8f892d0f36fda170a5cecf0aea89887d6d0e45ef)

Author SHA1 Message Date
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
Steven Bennetts 0c0391cc71 QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> Release
merge Branch_1-20-14-Viewer-merge -> release
Includes Branch_1-20-Viewer-2 through 92456
2008-07-22 19:01:52 +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
Josh Bell 292627c09d svn merge -r 91176:92383 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-23-Server
Backport fixes from the 1.23 Server branch

* DEV-17223 remove the words slot and bets from dataserver.xml
* DEV-17351 Unable to set estate manager
* DEV-17138 users with god mode capabilities not able to join groups
* DEV-17785 SVC-2633: Floating Text which was set before Server Update 1.23 does not do linebreaks anymore but one line instead
* DEV-17863 Memory Leak in 1.23 (related to returning objects?)
* DEV-17804 CSR tool showing old data on Summary page
* DEV-17811 Ban list showing (???) (???) for names

dataserver-is-deprecated
2008-07-17 22:30:12 +00:00
Christian Goetze b27e0e08f0 Add code to support add_viewer_version_to_manager 2008-07-15 01:34:41 +00:00
Jon Wolk ae464867e6 svn merge -r 90938:92097 svn+ssh://svn.lindenlab.com/svn/linden/branches/qar-730/qar-730-merge -> release. This is for QAR-730: Combination merge of QAR-432 and QAR-601 2008-07-15 00:41:08 +00:00
Christian Goetze 40d2bb564d QAR-622 merge -r91846:91877 svn+ssh://svn/svn/linden/branches/scut-newstyle-5 2008-07-10 16:52:33 +00:00
Kyle McKay 81443ef2aa Added -N | --no-distcc option to develop.py to prevent use of distcc in the generated makefiles 2008-07-10 02:58:58 +00:00
Kyle McKay c8eae77636 Check the actual version of the compiler we're going to use to compile the sources to determine which options need to be added rather than the version of some other compiler on the system. 2008-07-10 02:16:54 +00:00
Loren Shih 6626767245 For DEV-3892/VWR-6 : Poor warning message when message template not found
Added citation to doc/contributions.txt for VWR-6 patch.  This is just a doc change, not a code change.  I verified that VWR-6 code is currently in release such that this citation is deserved.

Authorized by: Robla.
2008-07-09 21:56:19 +00:00