Commit Graph

15789 Commits (c797cf6500a79f361ddfbaec589d64178efafcff)

Author SHA1 Message Date
Oz Linden 25b69823e6 merge changes for storm-1064 2011-03-16 21:24:21 -04:00
Oz Linden 31edad0a22 merge changes for storm-357 2011-03-16 21:22:45 -04:00
Merov Linden cd61ce72d7 Sync with bitbucket master repo 2011-03-16 18:09:43 -07:00
Merov Linden 6ee772bd42 Autobuild 2010: clean up argument passing for all configs 2011-03-16 18:09:00 -07:00
Christian Goetze (CG) fea0cefcb3 Add a more precise error check for "autobuild source_environment". 2011-03-16 16:44:19 -07:00
brad kittenbrink 55afeb9f54 Merge. 2011-03-16 19:29:55 -04:00
brad kittenbrink 4d11d30a3e Updated BuildParams in prep for vs2010 project viewer. 2011-03-16 19:29:14 -04:00
Jonathan Yap dbeb78aee2 STORM-1077 Fix setting for Sit hint, changed by accident during testing 2011-03-16 18:34:59 -04:00
Jonathan Yap d9015a836f STORM-1077 Change "Voice Enabled/Disabled" to "Speak Button" 2011-03-16 18:32:28 -04:00
Andrew de Laix 4b66f1e013 package all breakpad symlinks for linux. 2011-03-16 22:06:01 +00:00
Andrew de Laix 60fe203662 Automated merge with https://bitbucket.org/jenn_linden/viewer-vs2010 2011-03-16 20:54:18 +00:00
Andrew de Laix 2e0543a168 update linux to lates curl archive (linked to cares). 2011-03-16 20:54:12 +00:00
Andrew A. de Laix 12a539c82d update to latest curl library (linked to cares). 2011-03-16 13:53:06 -07:00
Christian Goetze (CG) dc8092a5d4 Merged: Comment out setting of TMP, do not recompute AUTOBUILD if it is already defined. 2011-03-16 12:31:04 -07:00
Christian Goetze (CG) c5ce29c871 Comment out setting of TMP, do not recompute AUTOBUILD if it is already defined. 2011-03-16 12:30:41 -07:00
Merov Linden e997db248f Pull from jenn_linden/viewer-vs2010 2011-03-16 09:51:46 -07:00
Andrew de Laix 1e4e9ee69b Automated merge with https://bitbucket.org/jenn_linden/viewer-vs2010 2011-03-16 16:06:56 +00:00
Andrew de Laix 38bdbbd019 rename google archive for linux to google-perftools and update to latest. 2011-03-16 16:06:47 +00:00
Andrew A. de Laix 1f5f03da38 fix hash for curl archive on darwin. 2011-03-16 09:05:20 -07:00
Andrew de Laix cd8485f9c0 update uuid archive for linux. 2011-03-15 20:54:22 +00:00
Richard Linden a024493c04 eol fixes 2011-03-15 13:36:23 -07:00
Dessie Linden abffd7aa4f Added viewer-pre-beta parameters to BuildParams 2011-03-15 13:25:38 -07:00
Oz Linden 742dd75751 increment viewer version to 2.6.1 2011-03-15 16:14:07 -04:00
Oz Linden 47b3d76790 Added tag 2.6.0-start for changeset 4e9eec6a347f 2011-03-15 16:12:43 -04:00
Andrew de Laix 650dd40187 update openal archive for linux. 2011-03-15 19:58:25 +00:00
Oz Linden 8386434017 Added tag 2.6.0-start for changeset f1827b441e05 2011-03-15 15:50:52 -04:00
Leyla Farazha 3f64343b0b Merge 2011-03-15 12:02:58 -07:00
Merov Linden 918caee18e Pull from jenn_linden/viewer-vs2010 2011-03-15 11:41:10 -07:00
Leyla Farazha fa277a3b4a SOCIAL-744 User cannot close Destination Guide and Avatar picker by clicking the respective buttons while open 2011-03-15 11:37:03 -07:00
Andrew de Laix 1de3c1e127 update jsoncpp archive on linux. 2011-03-15 18:12:43 +00:00
Oz Linden 4edb3b57dc merge build fixes from viewer-social 2011-03-15 13:52:09 -04:00
Richard Linden 2c22863888 another attempt at fixing gcc 2011-03-15 09:54:17 -07:00
Oz Linden 93620a1dc8 merge changes for storm-1078 2011-03-15 12:34:41 -04:00
Seth ProductEngine f1b1dbaba5 STORM-250 FIXED "More" link being toggled in expandable textbox after reshaping. 2011-03-15 18:23:20 +02:00
Richard Linden f619dd95d1 fix for gcc builds 2011-03-15 09:13:30 -07:00
Oz Linden 6faa6236f5 merge changes for storm-28 2011-03-15 09:26:58 -04:00
Oz Linden ae3e97024e merge changes for storm-1021 2011-03-15 09:26:38 -04:00
Merov Linden 72fd8c2ec4 Fix Mac Json cmake script 2011-03-14 23:57:57 -07:00
Merov Linden 35b61cdd44 Pull from jenn_linden/viewer-vs2010 2011-03-14 22:52:11 -07:00
Merov Linden ab27883b7e Pull from oz_linden/viewer-autobuild 2011-03-14 21:03:14 -07:00
Merov Linden e594d2585c Fix for Mac Debug build: no special debug libs for cares and jpeg libs 2011-03-14 21:00:27 -07:00
Richard Linden e637a29156 updated version to 2.6.0 2011-03-14 17:58:34 -07:00
Richard Linden b75060e290 Automated merge with ssh://hg.lindenlab.com/richard/viewer-social 2011-03-14 17:53:59 -07:00
callum abc8beaeaa SOCIAL-742 FIX Throttle time for SLAPPs is too long 2011-03-14 17:52:20 -07:00
Richard Linden 9b9d115830 Automated merge with ssh://hg.lindenlab.com/richard/viewer-social 2011-03-14 17:49:38 -07:00
Richard Linden 6336022ada SOCIAL-661 FIX Receiving Inventory notification in Basic Mode
SOCIAL-654 FIX Items purchased on Marketplace.secondlife.com while logged into Minimal skin are declined and not present in inventory
2011-03-14 17:49:11 -07:00
callum 01599c384b Merge with tip 2011-03-14 17:36:36 -07:00
callum ca6ca87934 Merge with tip of viewer development 2011-03-14 17:35:30 -07:00
Leyla Farazha eb59729b1e Merge 2011-03-14 17:23:14 -07:00
Leyla Farazha 4986896079 SOCIAL-605 Bottom bar buttons scale differently at lower resolutions 2011-03-14 17:21:45 -07:00