summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
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-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-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-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-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-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-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
2008-04-17QAR-449 Viewer 1.20 RC 1Steven Bennetts
merge Branch_1-20-Viewer -r 84432 : 84760 -> release
2008-04-17QAR-449 Viewer 1.20 RC 0Steven Bennetts
merge Branch_1-20-Viewer -r 84060 : 84432 -> release
2008-04-17Undid previous commit (bogus merge)Steven Bennetts
2008-04-17QAR-449 Viewer 1.20 RC 0Steven Bennetts
merge Branch_1-20-Viewer -r 84060 : 84432 -> release
2008-04-09svn merge -r83893:84415 ↵Dave Kaprielian
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-20-0-Server
2008-04-08svn merge -r84080:84255 svn+ssh://svn/svn/linden/branches/intermezzo-9Leyla Farazha
QAR-431
2008-04-04QAR-427Steven Bennetts
merge 3dconnex-merge -r 84010 : 84039 -> release
2008-04-03svn merge -r83872:83893 linden/branches/Branch_1-20-0-Server to linden/releaseKelly Washington
HAVOK4 IN TEH HOUSE!!11!!ONE!! If it is broken blame Joel for not fixing the loginassetdatabaseinventorygroupIM server instead of working on this. QAR-448
2008-04-031.19.1 Viewer merge: QAR_367, QAR-374, QAR-408, QAR-426Steven Bennetts
QAR_367 (RC1) - merge Branch_1-19-1-Viewer -r 81609 : 81993 -> release QAR-374 (RC2) - merge Branch_1-19-1-Viewer -r 81993 : 82589 -> release QAR-408 (RC3) - merge Branch_1-19-1-Viewer -r 82589 : 83128 -> release QAR-426 (rc4) - merge Branch_1-19-1-Viewer -r 83125 : 83719 -> release (Actual merge: release@83793 Branch_1-19-1-Viewer-merge@83953 -> release)
2008-04-03svn merge -r 83778:83944 maint-ui-10-mergeJames Cook
QAR-442
2008-04-01merge release@83343 skinning-1-merge@83714 -> releaseSteven Bennetts
QAR-424
2008-03-28Have the access permission changing code always return trueChristian Goetze
2008-03-27If the correct wy doesn't work, hack it instead -sigh-Christian Goetze
2008-03-27indentation errorChristian Goetze
2008-03-27Add dir_list attribute, populate it and use it to set access permissionsChristian Goetze
2008-03-26DEV-12468 Crash when setting preferencesSteven Bennetts
Simple addition to XML file.
2008-03-25merge release@82858 maint-render-2-merge@83010 -> releaseSteven Bennetts
QAR-389
2008-03-20merge release@82383 viewer-cleanup2-7-merge@82828Steven Bennetts
QAR-369
2008-03-20DEV-12219 Objects pulled from inventory showing up undergroundKarl Steifvater
fixes bug introduced by the maint-ui branch
2008-03-20DEV-12003 Activating god mode causes the admin menu to overlap the advanced ↵Karl Steifvater
menu when the tools menu is being displayed.
2008-03-19QAR-377 maintenance-6 merge:Brian McGroarty
svn merge -r 82602:82644 svn+ssh://svn/svn/linden/qa/maintenance-6-merge-82557 release/
2008-03-18svn merge -r 82263:82563 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-19-2-Server --> release Sprinkle "--location" pixie dust into farm curl calls QAR-387 - pull in fix for missing abuse report snapshots (asset-id --> asset_id) / DEV-11758 comment --> template comment tweak by yoz for postcards QAR-351 - Event queuing modifications DEV-11639 - fix for llsdhttp.py to work with newer eventlet API Rotating log_text_message is now part of the cron jobs
2008-03-15reverting premature commit at 82410.Steven Bennetts
2008-03-14[NOTE: This was an erroneous commit, and was reverted in the next revision]Mark Palange
QAR-369 - viewer-cleanup2-7 81916 merged into release.
2008-03-14svn merge -r 82272:82277 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-ui-9-merge-2 --> release QAR-364 - merge of maint-ui-9
2008-03-13Duh... I didn't test with default arguments, apparently.Josh Bell
* SConstruct doesn't like None as a default value; "False" will do nicely, since later logic tests for truth * Was using [] instead of get() for a value that might not be present (and wanted None in that case)
2008-03-13svn merge -r81066:82130 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-19-0-Viewer Pick up last minute changes to 1.19.0: * Access/Ban UI string "translation" fixes from 1.19.0.5 * Support for setting more scoped channel during builds/packaging, for A/B testing
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-31 15:42:55 +0000