Commit Graph

10776 Commits (8f892d0f36fda170a5cecf0aea89887d6d0e45ef)

Author SHA1 Message Date
Brian McGroarty 72f2542fb9 DEV-22360 - Interim fix for VWR-9784: Unable to upload scripts - this will be replaced later with final code, but we need to unblock release 2008-10-17 17:48:05 +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
Ryan Williams 635c06bb46 DEV-22018 : cllsd unit test failures. Fixed mostly by changing the Python code and the tests to look more like cllsd. 2008-10-10 19:57:34 +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
Don Kjer 4ff16b735f QAR-907: svn merge -r 98908:98910 svn+ssh://svn/svn/linden/qa/sim-metrics/sim-metrics2-release-merge-98903 into release 2008-10-09 18:07:46 +00:00
Mark Palange b807e3df99 merge r97380-98701 branches/viewer/viewer_1-21 (Viewer RC5 and security fixes) merge to trunk (for real) 2008-10-08 00:22:32 +00:00
Mark Palange 4296542cd0 Roll back of r98854 Accidentally commited merge in progress 2008-10-07 22:49:00 +00:00
Mark Palange c9be97fdfc merge r97380-98701 branches/viewer/viewer_1-21 (Viewer RC5 and security fixes) merge to trunk 2008-10-07 22:43:15 +00:00
Kent Quirk 9d7c56bf16 QAR-829: svn merge -r98245:HEAD svn+ssh://svn.lindenlab.com/svn/linden/branches/dev_10747_5 -> release 2008-10-07 21:53:42 +00:00
Kyle Ambroff 095aca3eae svn merge -r98039:98711 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-24-Server --> release
Merging various security fixes from Branch_1-24-Server.

Related to RequestXfer exploit:
* DEV-21706 (SEC-188): llParticleSystem can be used to obtain asset id.
* DEV-21767: Migrate RequestXfer to TCP-only
* DEV-21765: Fix RequestXfer traversal exploit
* DEV-21775: LLXferManager::processFileRequest() still has file vulnerabilities

Various fixes:
* fix for VFS memory corruption in llvfs.
* Bump server version to 1.24.9.

Landstore fixes:
* Passing locale to fulfill-order-item from region reservation fulfillment.
2008-10-07 20:50:30 +00:00
Christian Goetze b069bb9e71 svn merge -r96886:98039 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-24-Server --> release 2008-10-01 00:42:47 +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
Aaron Brashears 66739da164 Result of svn merge -r97546:97641 svn+ssh://svn/svn/linden/branches/apache-caps/merge-to-release into release. QAR-824 2008-09-29 17:41:54 +00:00
Bryan O'Sullivan 13c96cc47b DEV-19146 / Don't hard-code Windows paths. 2008-09-24 00:07:45 +00:00
Dave Kaprielian d0c70d11cb merge -r97452:97484 svn+ssh://svn.lindenlab.com/svn/linden/branches/deploy-refactor-2 2008-09-23 23:15:14 +00:00
Bryan O'Sullivan f89d3a7c2d Re-enable blowfish tests on Darwin. 2008-09-23 21:36:22 +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 2945882258 svn merge -r95195:96886 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-24-Server --> release
Merging fixes from 1.24 Server.

From vcr-maint-2:
* QAR-856: viewer crash log analyzer updates.

From direct-slurl-1:
* login.cgi: simplification of the way start-locations are chosen and the new-user browser tutorial is shown.
* No longer fake ever-logged-in flag
* support for dataservice query string encryption

from maint-server-4:
* DEV-19961: llInstantMessages of length N fail.

from landstore-v2-01-merge:
* DEV-12330: Allow Neighbors & Tweaks.
* DEV-14126: Re-order items on Region Detail page.
* DEV-14064: Add "Delete" order buttons in the View Cart area.
* DEV-15026: Indicate in the Event Log whether purchase is a Openspace or regular region.
* DEV-15242: disable checkout button after first click.
* DEV-15285: Region Names in cart or fulfilled should expire after 30 min or when delivered.
* DEV-14018: No currency listed for land prices
* DEV-1688: Tool: Ability to view and clear Allowed Neighbors from a region.
* DEV-17199: Fatal error when adding your login name to your allowed neighbors list.
* DEV-17251: Deleting an unavailable item from the shopping cart causes a fatal error.
* DEV-17291: Fatal error occurs when performing various activities.
* DEV-17177: Typo on Land store 2.01 checkout page.

From 1.24:
* DEV-19865 (SVC-2927): Abandoning land changes land name and description even when done by an Estate Manager.
* DEV-19916 (SVC-2938): bug fix for llGetNextEmail() failure.
* DEV-19936 (SVC-2962): adding a value to a list also modifies the list in place.
* SVC-2750, SVC-2958, SVC-2973: Changed LSL scheduler logic to yield if finished and no state change is pending.
* indra/lib/python/indra/agent/auth.py no longer assumes there is a critical message, and checks credential as specified by OGP rev3.
* DEV-20051: Added defensive checks on script rez path.
* Improvements to scripts/make_deploy_group.py.
* DEV-18897: llScriptReset wasn't resetting events for LSL scripts.
* DEV-20127: Fix for stl misuse in newsim/llsimparcel.cpp.
* DEV-18897: Mono Beta - LSL attach() event survives reset.
* DEV-20212 (VWR-9026): String fix - Attempting to teleport to "Help Island" produces a dialog referencing "Orientation Island"
* DEV-20164: llListen caching indefinitely across states.
* DEV-19950: timer() event triggers before on_rez(), & state_entry()
* DEV-19712 (SVC-2908): C# error messages with Mono Compiled scripts
* Fixes for chat service unit tests.
* DEV-19106: (SVC-1571): Rezzing a coalesced objects with 1024 scripted prims fails.
2008-09-17 10:21:38 +00:00
Bryan O'Sullivan 7920b59c9c DEV-16938: use per-build-type build trees on Linux 2008-09-16 21:59:48 +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
Kartic Krishnamurthy dcb74148f5 Banned the AIS related caps so that when the new Server is deployed, AIS code is NOT automatically enabled. 2008-09-16 18:51:11 +00:00
Kartic Krishnamurthy 785e5313bc QAR-751 : Merge Agent Inventory Services - Fetch Inventory and Fetch Inventory Descendents - to Release
Related Jiras:
1. DEV-17797 New Top Causes of Inventory Loss is Attachments with null folder_id
2. DEV-17937 null asset id not handled correctly in ais inventory fetch
3. OPSRT-1097 Update python-indra package on the system images
4. DEV-20505 QAR-751: Banning Cap "FetchLibDescendents" results in error in viewer log.
5. DEV-20328 QAR-751 Excessive log spam when using ais viewer against ais sim
6. DEV-20335 QAR-751 AIS bans are missing from message.xml

svn merge -r95983:96590 svn+ssh://svn/svn/linden/branches/ais-for-merge-qar-751 .

Miscellaneous commit:
1. Fixed silly bug in llsd-rest that broke connects to https on a non-standard port

svn merge -r95983:96590 svn+ssh://svn/svn/linden/branches/ais-for-merge-qar-751 .
2008-09-16 18:16:24 +00:00
Kartic Krishnamurthy 80f6196327 QAR-751 : Merge Agent Inventory Services - Fetch Inventory and Fetch Inventory Descendents - to Release
Related Jiras:
1. DEV-17797 New Top Causes of Inventory Loss is Attachments with null folder_id
2. DEV-17937 null asset id not handled correctly in ais inventory fetch
3. OPSRT-1097 Update python-indra package on the system images
4. DEV-20505 QAR-751: Banning Cap "FetchLibDescendents" results in error in viewer log.
5. DEV-20328 QAR-751 Excessive log spam when using ais viewer against ais sim
6. DEV-20335 QAR-751 AIS bans are missing from message.xml

svn merge -r95983:96590 svn+ssh://svn/svn/linden/branches/ais-for-merge-qar-751 .

Miscellaneous commit:
1. Fixed silly bug in llsd-rest that broke connects to https on a non-standard port
2008-09-16 18:12:32 +00:00
Steven Bennetts 96869c0de4 Fix for VC7 DEBUG build failure 2008-09-15 19:45:18 +00:00
Bryan O'Sullivan 07b856b7a4 Revert r96619 for now 2008-09-15 16:27:28 +00:00
Bryan O'Sullivan 53869a091c DEV-18419 / Allow develop.py to be run from outside source tree
Whatever directory develop.py is run from, it will create the build
trees there.

Reviewed by Mani.
2008-09-12 23:56:45 +00:00
Steven Bennetts b2bbc4021c Committing missed file from viewer_1-21 merge 2008-09-12 16:49:09 +00:00
Steven Bennetts da94c0eaa2 QAR-855 Viewer 1.21 RC 2
merge viewer_1-21 94770-96059 -> release
2008-09-12 06:27:13 +00:00
Kyle Ambroff 642cdd9572 svn merge -r96049:96026 -r95956:95931 -r95867:95775 svn+ssh://svn/svn/linden/release
Reverting my changes to the package target. It subtly broke the windows build in a way I didn't want to try to fix in release. Will fix in another branch.
2008-09-11 16:32:58 +00:00
James Cook cfde9d568e Added Windows installer template files to Visual Studio solution for convenience. Reviewed with Ambroff. 2008-09-09 20:33:05 +00:00
Kyle Ambroff fd32a26c1b Exclude package target from 'make all' on Linux, to match Windows and OSX behavior. 2008-09-06 07:07:21 +00:00
Bryan O'Sullivan e728263717 Use correct CMake names for boolean values. 2008-09-05 23:05:30 +00:00
Bryan O'Sullivan 8ba757aab2 Fix dataserver build on OS X. 2008-09-05 23:05:13 +00:00
Andrew Meadows 222bca24c1 svn merge -r95288:95907 svn+ssh://svn.lindenlab.com/svn/linden/qa/maint-server/qar-841
this is a combined mergeback of the following branches as per QAR-841:
  maint-server/maint-server-1 (absorbed by maint-server-2)
  maint-server/maint-server-2
  maint-server/maint-server-3
  havok4/havok4-8
  havok4/havok4-9

yes dataserver-is-deprecated
2008-09-05 22:03:35 +00:00
Kyle Ambroff 1493a21262 svn merge -r95837:95841
svn+ssh://svn.lindenlab.com/svn/linden/branches/package-target-not-optional
--> release

Always add the package target, but do not include it when selecting
"Build Solution". Reviewed by james.
2008-09-05 17:11:59 +00:00
Bryan O'Sullivan bf975f9872 VWR-8889 / DEV-20131 - Make the name of the viewer binary settable 2008-09-04 20:19:00 +00:00
James Cook 0e05ef68f9 Added help text for -DSERVER:BOOL=FALSE and -DPACKAGE:BOOL=TRUE options. No actual code changes. Reviewed with Kelly. 2008-09-03 18:08:12 +00:00
Jim Purbrick c4d1e19668 * Updated install.xml to reference fixed mono lib.
Not reviewed
2008-09-03 14:47:19 +00:00
Bryan O'Sullivan 2ba3b22a20 Don't link llcommon against iconv yet. 2008-09-02 21:24:31 +00:00
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