summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2008-06-06Changed the cygwin to windows path conversion to use 'cygpath -w'Mark Palange
2008-06-06make it work on cygwin again. also fixed a bad parameter.Aaron Brashears
2008-06-06DEV-16277 superfluous "Price" text appears in Edit toolsSteven Bennetts
Note: trivial change.
2008-06-06DEV-16285 - Give vstool.exe better error reporting output.Mark Palange
2008-06-05Don't add a package target on Windows or OS X by default.Bryan O'Sullivan
This improves build times, since most devs don't need to package stuff. Reviewed by that fine specimen of reviewerhood, Palange.
2008-06-05Autodetect an installed version of Visual Studio.Bryan O'Sullivan
Reviewed by Palange.
2008-06-04Wave a dead chicken over the mac linkerBryan O'Sullivan
2008-06-04Fix incorrectly named linker variableBryan O'Sullivan
2008-06-04Pick up our libraries on Darwin.Bryan O'Sullivan
2008-06-03Mac open source export - cmake fixesBrian McGroarty
2008-06-03Let's see if this works better.Bryan O'Sullivan
2008-06-03Don't include copy_win_scripts if it does not exist.Bryan O'Sullivan
2008-06-03Build fixBryan O'Sullivan
2008-06-02FIXED silly mistake.Callum Prentice
Added another alternate, default location for DirectX SDK files. Reviewed by Mani
2008-06-02Fix Ubuntu compilation problemBryan O'Sullivan
2008-06-02Added another alternate, default location for DirectX SDK files.Callum Prentice
Reviewed by Mani
2008-06-02svn merge -r88806:88810 ↵Ryan Williams
svn+ssh://svn.lindenlab.com/svn/linden/branches/escrow/liquid-banjo-05 into release
2008-06-02Fixes to make test.py pass. Code changes reviewed by bos.Ryan Williams
2008-06-02svn merge -r88066:88786 ↵Bryan O'Sullivan
svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge dataserver-is-deprecated for-fucks-sake-whats-with-these-commit-markers
2008-05-30fix wassert symbol problem, copied from cmake branchChristian Goetze
2008-05-21add --no-run-if-empty to xargs call to avoid packing error for devsChristian Goetze
2008-05-20svn merge -r87877:87878 ↵James Cook
svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-ui/maint-ui-12-qa-5 which is the last iteration of the maint-ui series of branches. Future work will be in featurettes.
2008-05-19EFFECTIVE MERGES:Don Kjer
svn merge -r 79616:82632 svn+ssh://svn/svn/linden/branches/maintenance/maintenance-7 into release svn merge -r 83211:87215 svn+ssh://svn/svn/linden/branches/php-framework-3 into release ACTUAL MERGE: svn merge -r 87631:87698 svn+ssh://svn/svn/linden/qa/combo-merge-maintenance-7-php-framework-3 into release dataserver-is-deprecated
2008-05-14Result of svn merge -r 87455:87538 $SVN/branches/tulla/vc3-merge .Eric Tulla
Passed QA as part of QAR-491.
2008-05-13svn merge -r 87164:87466 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-21-Server --> release Land store (already deployed to agni as 1.21 patches) * Increased the available purchase area in the land store. * Modified select pool query to take a simulator status. Now generating a new uuid for each insert into the fulfill lock table. * Checking to make sure put-simstate returns a uuid region_id. Other stuff (going out soon or already out) * svn merge -r87339 svn/linden/branches/havok4/havok4-6 (Block creation of mega prims.) * Fix for the mega prim fix to also block 0 scale prims. * svn merge -r 84565:86084 svn+ssh://svn.lindenlab.com/svn/linden/branches/single-ref-attach-again --> Branch_1-21-Server (Slipstream QAR-518 single ref attachments) * Switched off indra.known_address in favor of indra_aux.known_address * DEV-15151 check_group_land.py kills the database * DEV-14662 - Change the current model of PREPARE/EXECUTE to directly execute the SQL (QAR-580) * DEV-15167 Random failure with set-classified-stats The secret word is: dataserver-is-deprecated
2008-05-13svn merge -r87349:87423 ↵Ryan Williams
svn+ssh://svn.lindenlab.com/svn/linden/branches/escrow/liquid-banjo-03-merge release dataserver-is-deprecated
2008-05-11QAR-566 maint-viewer-5-merge-2Steven Bennetts
Effective merge: release@84102 maint-viewer-5@86348 -> maint-viewer-5-merge-2 Actual merge maint-viewer-5-merge-2 -r 87239 : 87246 -> release
2008-05-09QAR-537 Viewer 1.20 RC 6Steven Bennetts
merge -r 86279:86925 Branch_1-20-Viewer -> release
2008-05-09QAR-565 search-milestone2-merge (more web tabs in search)Steven Bennetts
dataserver-is-deprecated
2008-05-08svn merge -r 86553:86607 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/secure-im --> release QAR-564 - constrained fix for SEC-71
2008-05-08QAR-570 maint-render-4 mergeSteven Bennetts
merge -r 87067:87077 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-4-merge -> release. dataserver-is-deprecated.
2008-05-07svn merge -r 86558:86977 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-21-Server * QAR-567 Deploy user-start-migration-again login.cgi and friends to agni * DEV-14807 dir-places and dir-classifieds web-ds calls are failing * DEV-9962 SVC-1428: Malformed llInstantMessage() gets sent to email, stuck in queue, and spammed to email at every login * DEV-12696 Limit the number of group_notices in a group NOTE: merge involved renames to the following to have "nq" extension * indra/web/dataservice/sql/sequence/cart_items/update (actual change) * indra/web/dataservice/sql/indra/select-dir-places-parcel (which was a no-op merge) The magic words are: dataserver-is-deprecated
2008-05-07Back out QAR-520 maintenance-7 merge -- svn merge -r 86947:86946 ↵Brian McGroarty
svn+ssh://svn.lindenlab.com/svn/linden/release dataserver-is-deprecated
2008-05-07QAR-520 maintenance-7 merge -- svn merge -r 84923:86093 ↵Brian McGroarty
svn+ssh://svn.lindenlab.com/svn/linden/qa/maintenance-7-sandbox-84884 -- dataserver-is-deprecated
2008-05-06svn merge -r86582:86825 ↵Kartic Krishnamurthy
svn+ssh://svn/svn/linden/branches/nq-extension-for-merge-1 . Original Jira: https://jira.lindenlab.com/browse/DEV-11178 (Proposal: To rename named query files to take an extension .nq) Sandbox Jira: https://jira.lindenlab.com/browse/QAR-470 (Test a massive rename of named query files from being extensionless to having a .nq extension) Merge Buildme: https://jira.lindenlab.com/browse/QAR-473 Original Code Review: BillC
2008-05-06merge release-QAR-511 Viewer 1.20 RC 5Steven Bennetts
merge Branch_1-20-Viewer -r 85828 : 86279 -> release
2008-05-02svn merge -r 86069:86558 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-21-Server --> release * QAR-522 / DEV-14318: Crash in LLSD:operator[] -- web connected? Traceback includes LLCurl::Responder::completed * landstore-6 dataservices * DEV-14141 - Enable avatar-properties. done 2008-05-01 14:00 * new query, for use by sl.com /lib/models/login.php * disabling evil slave crashing query. Also the following which has NOT been pushed into production yet * QAR-531 DEV-14457 SEC-67 Hacked client can bypass estate access lists
2008-04-30svn merge -r 86190:86191 maint-ui-11-merge (EFFECTIVE MERGE: -r 84579:85724 ↵James Cook
maint-ui-11-qa).
2008-04-30Workaround for cygwin flex 2.5.35 bug.Steven Bennetts
Reviewed by Phoenix
2008-04-29Result of svn merge -r85981:85991 ↵Aaron Brashears
svn+ssh://svn/svn/linden/branches/ssl-sanity-merge into release. QAR-487
2008-04-29Fixed a bogus assert and a rare but obvious crash bug.Steven Bennetts
Reviewed by Palmer
2008-04-28merge release-QAR-499 Viewer 1.20 RC 3Steven Bennetts
merge release-QAR-508 Viewer 1.20 RC 4 merge Branch_1-20-Viewer -r 85278 : 85828 -> release
2008-04-28merge release-QAR-499 Viewer 1.20 RC 2 (additional changes)Steven Bennetts
merge Branch_1-20-Viewer -r 85100 : 85278 -> release
2008-04-28svn merge -r 84911:86069 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-21-Server --> release Backport fixes made in the production branch to the trunk now that it is live on the grid: * DEV-14443 Launcher not producing colo prefix when looking up sim class * DEV-10840 "/etc/init.d/backbone stop" returns before all child backbones exited; "backbone restart" results in defunct children * DEV-12558: Able to make anyone's object shout error messages * QAR-483 user start location migration prelude * QAR-490 havok4-6 * Revert havok4-5/4-6 code changes causing parcel access check issues * Revert QAR-277 sqlite-backbone * DEV-12357 SEC-53: Script that crashes regions * QAR-486 New proc and query for Web Classifieds Fix
2008-04-25QAR-404 - merge - svn merge -r 85795:HEAD ↵Brian McGroarty
svn+ssh://svn.lindenlab.com/svn/linden/branches/metrics/metrics-4-release release
2008-04-24svn merge -r 85582:85586 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-viewer-5-merge QAR-500 maint-viewer-5 merge
2008-04-23QAR-488 Viewer 1.20 RC 2Steven Bennetts
merge Branch_1-20-Viewer -r 84760 : 85100 -> release
2008-04-22QAR-468 "Babble Lipsync MergeMe"Adam Moss
svn merge -c85508 svn+ssh://svn.lindenlab.com/svn/linden/branches/babble-merge1-r85500
2008-04-18QAR-493 Linux startup crashBrian McGroarty
2008-04-17QAR-460 Automatic XUI selection & Kick-ass Linux Fonts MergeMeAdam Moss
svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@84983 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/fontconfig-merge1
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 16:09:37 +0000