summaryrefslogtreecommitdiff
path: root/indra/llcommon/llapp.cpp
AgeCommit message (Collapse)Author
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-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-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-16QAR-455 Launcher and Heartbeat fixes MergeMeAdam Moss
svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@84853 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/signalcrap-merge1
2008-02-07svn merge -r 79445:79449 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/qa/maintenance-5-merge-79386 QAR-242 merge of maintenance-5 (QAR-203) * DEV-6548 Copy To Inventory fail to execute without any output feedback when Notecard has changes but not saved * DEV-7600 Deleting someone else's object in god mode crashes sim * DEV-5329 LLSD parsers should determine and set maximum parse sizes * DEV-7473 Resolve instant message crash report * DEV-2904 Presence Issues not (apparently) caused by scripted attachments * DEV-7083 Investigate Null Folder IDs Bug that caused 470K inventory items with Null Folder IDS on the Grid * DEV-2865 Textures/Snapshots in a notecard are opened again when you click copy to inventory. * DEV-6612 VWR-3290: Linux scons build script doesn't work with distcc * DEV-8002 c++ llsd notation parser accepts malformed data * DEV-8001 c++ xml parse returns wrong number of elements parsed * DEV-8089 Double delete in statc structured data parse functions * DEV-5326 Any viewer can request presence information for any agent * DEV-2378 python service builder does not sort query string * DEV-7872 Block teleport off teen grid sub-estates like Schome Park / Open University * DEV-4465 Add a "logfile" command line option to the sim to create log files
2007-11-09EFFECTIVE MERGE: svn merge -r 70833:71458 ↵Don Kjer
svn+ssh://svn/svn/linden/branches/maintenance-2 into release ACTUAL MERGE: svn merge -r 73210:73222 svn+ssh://svn/svn/linden/qa/maintenance-2-merge-73206 into release
2007-10-04Result of svn merge -r71162:71205 ↵Aaron Brashears
svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.
2007-02-06merge in of error-refactor-3Mark Lentczner
concludes (fixes) SL-31187 pair programmed and reviewed by markl and karen
2007-01-04svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@56429 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance@56431 This turned up the following "lost" changes: llapp.cpp (from maintenance r55371) - SIGPIPE fix, possibly llfontgl.cpp (from maintenance r50207) - whitespace only inventorybridge.cpp (property - non-executable) skins/xui/*/* (from maintenance r55380) - XML processing instruction went AWOL
2007-01-03corrected, removed, and updated comments throughout the code to be more ↵Aaron Brashears
useful. no code changes. SL-13762
2007-01-02Print done when done.James Cook
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-31 11:54:49 +0000