summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2008-10-09QAR-907: svn merge -r 98908:98910 ↵Don Kjer
svn+ssh://svn/svn/linden/qa/sim-metrics/sim-metrics2-release-merge-98903 into release
2008-10-08merge r97380-98701 branches/viewer/viewer_1-21 (Viewer RC5 and security ↵Mark Palange
fixes) merge to trunk (for real)
2008-10-07Roll back of r98854 Accidentally commited merge in progressMark Palange
2008-10-07merge r97380-98701 branches/viewer/viewer_1-21 (Viewer RC5 and security ↵Mark Palange
fixes) merge to trunk
2008-10-07QAR-829: svn merge -r98245:HEAD ↵Kent Quirk
svn+ssh://svn.lindenlab.com/svn/linden/branches/dev_10747_5 -> release
2008-10-07svn merge -r98039:98711 ↵Kyle Ambroff
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-01svn merge -r96886:98039 ↵Christian Goetze
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-24-Server --> release
2008-09-29QAR-872 Viewer 1.21 RC 3Steven Bennetts
merge viewer_1-21 96116-97380 -> release
2008-09-29Result of svn merge -r97546:97641 ↵Aaron Brashears
svn+ssh://svn/svn/linden/branches/apache-caps/merge-to-release into release. QAR-824
2008-09-24DEV-19146 / Don't hard-code Windows paths.Bryan O'Sullivan
2008-09-23merge -r97452:97484 ↵Dave Kaprielian
svn+ssh://svn.lindenlab.com/svn/linden/branches/deploy-refactor-2
2008-09-23Re-enable blowfish tests on Darwin.Bryan O'Sullivan
2008-09-23QAR-849 merge maint-viewer-10-merge 96838-97237 -> releaseSteven Bennetts
2008-09-17svn merge -r95195:96886 ↵Kyle Ambroff
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-16DEV-16938: use per-build-type build trees on LinuxBryan O'Sullivan
2008-09-16QAR-751 : Merge Agent Inventory Services - Fetch Inventory and Fetch ↵Kartic Krishnamurthy
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-15Fix for VC7 DEBUG build failureSteven Bennetts
2008-09-15Revert r96619 for nowBryan O'Sullivan
2008-09-12DEV-18419 / Allow develop.py to be run from outside source treeBryan O'Sullivan
Whatever directory develop.py is run from, it will create the build trees there. Reviewed by Mani.
2008-09-12Committing missed file from viewer_1-21 mergeSteven Bennetts
2008-09-12QAR-855 Viewer 1.21 RC 2Steven Bennetts
merge viewer_1-21 94770-96059 -> release
2008-09-11svn merge -r96049:96026 -r95956:95931 -r95867:95775 ↵Kyle Ambroff
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-09Added Windows installer template files to Visual Studio solution for ↵James Cook
convenience. Reviewed with Ambroff.
2008-09-06Exclude package target from 'make all' on Linux, to match Windows and OSX ↵Kyle Ambroff
behavior.
2008-09-05Use correct CMake names for boolean values.Bryan O'Sullivan
2008-09-05Fix dataserver build on OS X.Bryan O'Sullivan
2008-09-05svn merge -r95288:95907 ↵Andrew Meadows
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-05svn merge -r95837:95841Kyle Ambroff
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-04VWR-8889 / DEV-20131 - Make the name of the viewer binary settableBryan O'Sullivan
2008-09-03Added help text for -DSERVER:BOOL=FALSE and -DPACKAGE:BOOL=TRUE options. No ↵James Cook
actual code changes. Reviewed with Kelly.
2008-09-02Don't link llcommon against iconv yet.Bryan O'Sullivan
2008-09-02QAR-842 / Port Mac build borkage fix to releaseBryan O'Sullivan
2008-08-30libpng needs linking against zlibBryan O'Sullivan
2008-08-29Switch more libraries over to target_link_librariesBryan O'Sullivan
2008-08-29Switch llimage and llxml to target_link_librariesBryan O'Sullivan
2008-08-29Use target_link_libraries for llaudioBryan O'Sullivan
2008-08-29Use target_link_libraries for llcommonBryan O'Sullivan
2008-08-29svn merge -r94413:95195 ↵Kyle Ambroff
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-28merge viewer/viewer_1-21 94170-94770 -> releaseSteven Bennetts
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-28Revert last change to develop.py because it breaks manually passing ↵James Cook
-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-28DEV-19836 Add --package and --viewer-only options to develop.py. Ported ↵James Cook
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-28QAR-702 - Merge DPO-14 to ReleaseKartic Krishnamurthy
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-27One-liner fix for indra.base.llsd.parse_datestr. Ensure that seconds are ↵Kyle Ambroff
always 2 digits if there are no microseconds. Updated unit tests to enforce this. Reviewed by James.
2008-08-26merge -r94900 linden/branches/kelly/qar-825 to linden/releaseKelly Washington
QAR-825 DEV-18489 Event poll is brittle and doesn't parse status correctly
2008-08-25Fix gcc4 with proper Linden-canonical struct definitionsBrian McGroarty
2008-08-21Master QAR-807 passed.Kartic Krishnamurthy
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-21Additional gcc warnings - no code effectBrian McGroarty
2008-08-18fix for DEV-18488 - remove optimization for RelWithDebInfo for Darwin ↵Paul Oppenheim
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-14svn merge -r 93885:94413 ↵Josh Bell
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-13Fixed DEV-19210 - reviewed by joshChristian Goetze
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 11:09:31 +0000