Commit Graph

389 Commits (c01edec021194bacb86dc9a3f5a3cc655a8cb15f)

Author SHA1 Message Date
Adam Moss c01edec021 QAR-468 "Babble Lipsync MergeMe"
svn merge -c85508
svn+ssh://svn.lindenlab.com/svn/linden/branches/babble-merge1-r85500
2008-04-22 16:17:22 +00:00
Brian McGroarty 06e8af59a9 QAR-493 Linux startup crash 2008-04-18 17:03:26 +00:00
Adam Moss 669d1162f4 QAR-460 Automatic XUI selection & Kick-ass Linux Fonts MergeMe
svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@84983
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/fontconfig-merge1
2008-04-17 14:56:00 +00:00
Steven Bennetts a3f3ab7e11 QAR-449 Viewer 1.20 RC 1
merge Branch_1-20-Viewer -r 84432 : 84760 -> release
2008-04-17 02:56:14 +00:00
Steven Bennetts d85247e63e QAR-449 Viewer 1.20 RC 0
merge Branch_1-20-Viewer -r 84060 : 84432 -> release
2008-04-17 02:42:27 +00:00
Steven Bennetts d2597d35cf Undid previous commit (bogus merge) 2008-04-17 02:25:04 +00:00
Steven Bennetts c57beb8b4b QAR-449 Viewer 1.20 RC 0
merge Branch_1-20-Viewer -r 84060 : 84432 -> release
2008-04-17 02:06:30 +00:00
Adam Moss fb42741b62 QAR-455 Launcher and Heartbeat fixes MergeMe
svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@84853
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/signalcrap-merge1
2008-04-16 09:29:07 +00:00
Dave Kaprielian 68988bddeb svn merge -r84476:84911 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-21-Server
Includes pullout of migrate-start-location-2, webservice changes made to 1.20, DEV-7229, and other web-ds changes. Reviewed by Josh.
2008-04-16 00:28:54 +00:00
Leyla Farazha acc8ae40cd svn merge -r84490:84497 svn+ssh://svn/svn/linden/branches/DEV-11812-3
QAR-433 make max queued size on event queue configurable
2008-04-10 17:43:25 +00:00
Aaron Brashears 3f08a67dc6 Result of svn merge -r84383:84400 svn+ssh://svn/svn/linden/branches/migrate-start-location-2 intinto release. QAR-458 2008-04-09 18:03:28 +00:00
Dave Kaprielian 16f6d79f76 svn merge -r83893:84415 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-20-0-Server 2008-04-09 06:12:20 +00:00
Leyla Farazha b73ad51784 svn merge -r84080:84255 svn+ssh://svn/svn/linden/branches/intermezzo-9
QAR-431
2008-04-08 21:04:41 +00:00
Steven Bennetts f5e386527c QAR-427
merge 3dconnex-merge -r 84010 : 84039 -> release
2008-04-04 01:22:03 +00:00
Kelly Washington 96add52a1c Fix mac build from havok4 merge. 2008-04-03 23:53:20 +00:00
Kelly Washington dc48f1c741 svn merge -r83872:83893 linden/branches/Branch_1-20-0-Server to linden/release
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-03 22:50:22 +00:00
Steven Bennetts b5936a4b1d 1.19.1 Viewer merge: QAR_367, QAR-374, QAR-408, QAR-426
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-03 19:21:14 +00:00
James Cook 55c25229b7 svn merge -r 83778:83944 maint-ui-10-merge
QAR-442
2008-04-03 18:43:54 +00:00
Steven Bennetts b3fcfa16ba DEV-13060 - Crash when pressing TAB in quick search window.
Reviewed by coco
2008-04-03 01:11:17 +00:00
Steven Bennetts 941cb9f412 merge release@83343 skinning-1-merge@83714 -> release
QAR-424
2008-04-01 17:45:04 +00:00
Josh Bell ecec626dec svn merge -r 83166:83647 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-19-2-Server --> release
Handful of changes from the production branch, mostly in the dataservices. Login.cgi changes to mitigate DB load and support A/B testing of the browser-hud work. Revert crash reporter behavior to 1.19.1 to avoid DB grief.
2008-03-31 18:37:31 +00:00
Christian Goetze 32e11b2ef5 Have the access permission changing code always return true 2008-03-28 22:00:17 +00:00
Christian Goetze 069b12a21b If the correct wy doesn't work, hack it instead -sigh- 2008-03-27 23:58:18 +00:00
Brian McGroarty ba9fe19a51 DEV-12322 - text file - CC By-SA 3.0 upgrade: edit LICENSE-logos.txt in bin and source 2008-03-27 23:10:30 +00:00
Christian Goetze 287f4d44f3 indentation error 2008-03-27 21:49:06 +00:00
Christian Goetze bbbaca2af1 Add dir_list attribute, populate it and use it to set access permissions 2008-03-27 21:07:50 +00:00
Donovan Preston e62bb20188 QAR-277 svn merge -r83278:83442 svn+ssh://svn.lindenlab.com/svn/linden/branches/sqlite-backbone-merge 2008-03-27 18:43:57 +00:00
Steven Bennetts c5523188c0 DEV-12468 Crash when setting preferences
Simple addition to XML file.
2008-03-26 01:59:33 +00:00
Steven Bennetts 6fcf38217e merge release@82858 maint-render-2-merge@83010 -> release
QAR-389
2008-03-25 22:50:26 +00:00
Josh Bell 11a3589665 svn merge -r 82869:83166 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-19-2-Server --> release
Includes:
DEV-12492 "new" regAPI fails on php-framework-2
DEV-11540 Show browser HUD for A/B test users coming from SL.com.
DEV-11730 LLSD parser changes
PHP logs to syslog
DEV-12146 php llsd_UUID does not pass the IsUUID() validation function
DEV-12356 oldstyle FetchInventoryDescendents should be TEMPLATE not LLSD
steve's fix to setting the proxy option in curl
2008-03-25 19:10:33 +00:00
Josh Bell 9fd4dfa572 svn merge -r 82563:82869 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-19-2-Server --> release
DEV-12326 DEV-12232 fix for strange string crashes.
web dataservices: fixed issue with non-selects not returning affected rows, also cleaned up log messages and unit tests
DEV-12232 fix for crash bug.
DEV-12105 Setting a music URL which is too long creates many problems
Adding streambase log message for login failures.
Changed URL for FetchInventoryDescendents to use new webservice when we're ready.
DEV-12140 - Mapserver crashes in 1.19.2 Server
QAR-390 - Add log_viewer_stats syslog writes
need to deploy vault_control.pl central services, for reg
DEV-11104 - Don't chew up memory profiling everything in pay-stipends.pl
web dataservices: minor changes: logging added, mailer host changed to localhost per Ops
2008-03-21 01:28:52 +00:00
Steven Bennetts e3b97ac65b merge release@82383 viewer-cleanup2-7-merge@82828
QAR-369
2008-03-20 21:41:26 +00:00
Karl Steifvater b502c86f30 DEV-12219 Objects pulled from inventory showing up underground
fixes bug introduced by the maint-ui branch
2008-03-20 21:14:33 +00:00
Karl Steifvater 2b59d3b013 DEV-12003 Activating god mode causes the admin menu to overlap the advanced menu when the tools menu is being displayed. 2008-03-20 00:31:07 +00:00
James Cook 4c21366d9e Removed assert causing Debug build warnings/errors on Windows. Reviewed with Qarl. OK with Josh. 2008-03-19 22:36:26 +00:00
James Cook 23639bca3a Fixed unit test failure on Windows, "/tmp" doesn't exist on Win32. Ported from Havok4 branch, reviewed with Kelly, OK with Josh. 2008-03-19 22:35:07 +00:00
Brian McGroarty 25de7377c1 QAR-377 maintenance-6 merge:
svn merge -r 82602:82644 svn+ssh://svn/svn/linden/qa/maintenance-6-merge-82557 release/
2008-03-19 00:01:42 +00:00
Josh Bell 2d9afdaa03 svn merge -r 82263:82563 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-18 21:56:57 +00:00
Steven Bennetts 672a76d0ea reverting premature commit at 82410. 2008-03-15 01:18:27 +00:00
Mark Palange 04611efae8 [NOTE: This was an erroneous commit, and was reverted in the next revision]
QAR-369 - viewer-cleanup2-7 81916 merged into release.
2008-03-14 23:21:38 +00:00
Josh Bell c0c5bdbbb9 svn merge -r 82064:82066 svn+ssh://svn/svn/linden/qa/dev-11639-sandbox
Merge fix for DEV-11639 - fix for llsdhttp.py to work with newer eventlet API
2008-03-14 19:54:41 +00:00
Josh Bell 133a7b5fe2 svn merge -r 82272:82277 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-ui-9-merge-2 --> release
QAR-364 - merge of maint-ui-9
2008-03-14 19:27:38 +00:00
Josh Bell a1cde743e7 Duh... I didn't test with default arguments, apparently.
* 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-13 22:26:47 +00:00
Josh Bell d60c966bcf svn merge -r81066:82130 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
2008-03-13 20:00:55 +00:00
Josh Bell d2e5b7ca85 svn merge -r 81720:82231 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-19-1-Server --> release 2008-03-13 16:54:05 +00:00
Josh Bell 618e625ad9 svn merge -r 82118:82122 svn+ssh://svn.lindenlab.com/svn/linden/qa/dpo-12-merge-2
QAR-356 Merge of DPO-12
2008-03-13 16:27:21 +00:00
Josh Bell 1be80e5c50 svn merge -r 82016:82020 svn+ssh://svn.lindenlab.com/svn/linden/branches/single-ref-attachments-merge --> release
QAR-302 Merge single reference attachments work (including cruft deletion)
2008-03-12 00:15:14 +00:00
Steven Bennetts 377ae59c21 merge Branch_1-19-1-Viewer -r 80930 : 81609 -> release
DEV-11202: Unhandled Excpetion in pipeline.cpp.
Merged over updated windlight ui help text from windlight14.
Reverting a const change in a virtual that was not propagated to all overrides.
DEV-10957 stop and pause Media and music buttons do not work
DEV-10762 Displayed page in the client browser disappears when crossing property boundaries.
DEV-11220 replace misspellings in alerts.xml parameters of 'messsage'
DEV-11221 fix a misspelling of 'participants' in floater_chat_history.xml tooltip
DEV-11193 clean up some viewer strings related to Windlight help text
svn merge -r81144:81147 svn+ssh://svn/svn/linden/branches/1-19-1-viewer-threads
DEV-11110  	 Media browser history dropdown does not save items across sessions
Ran the xuiparse -process tool on all en-us xml files.  This does NOT change any data, merely reorders attributes and cleans up tab/spacing.
DEV-11349 XML CLEANUP: fix duplicate sibling names in en-us xui files
DEV-11348 Change to llmimetypes.cpp broke Media Type dropdown
dev-10623 "parcels that played movies no longer work in combo-merge-ui"
DEV-11379 - crash in LLTabContainer::draw()
DEV-11377 Elminiate dangerous LLLinkedList and LLDoubleLinkedList from newview
DEV-11158 sculpties on the top10 crash list
DEV-11404 "Send Current URL to Parcel" does not set the MIME type
merge 80958:80959 maint-ui-9-qa, DEV-11105 -- Searching for people with 3 characters like "j l" hurts the database.
DEV-10489: no draw distance cheating
DEV-879: water noise frequency
DEV-10764: macbook air support
DEV-10878: Linux Intel945 support
DEV-7551: featuretable adjustments for framerate.
DEV-11426 Enormous mini-map.
DEV-11505 - Crash in gunzip_file.
Removed final LinkedList, SkipMap, and AssocList templates from the Viewer!
DEV-11115  truncated word in the Advanced Water Editor's modal help dialog
2008-03-11 01:47:36 +00:00
James Cook 9d12bd5e27 svn merge -r81924:81925 svn+ssh://svn.lindenlab.com/svn/linden/branches/browser-hud/browser-hud-4-merge-2
QAR-345 Browser HUD web based tutorial for new users
2008-03-11 00:09:44 +00:00
Brad Kittenbrink ba607fe406 QAR-345 merge windlight scriptglow3 into release
Qarl's viewer and simulator patch to add glow functionality to
llGetPrimitiveParams/llSetPrimitiveCommands

svn merge -r 81743:81787 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge_scriptglow3_r81714
2008-03-10 16:32:21 +00:00