Ignored revisions: 12346 included in: 225046 changeset: 17039:804279095004 tag: tip parent: 17022:ad4c572ef3d0 parent: 17038:b876a7a85d54 user: Nyx (Neal Orman)date: Fri Mar 25 14:51:29 2011 -0400 summary: merge from mesh-development to nyx-mesh-development codeticket: 225042 included in: 225046 changeset: 17038:b876a7a85d54 parent: 17029:0ba69511a9b2 parent: 17037:9547c65860a5 user: Loren Shih date: Fri Mar 25 10:47:49 2011 -0400 summary: Automated merge up from viewer-development into mesh-development codeticket: 225035 included in: 225042 changeset: 17037:9547c65860a5 parent: 17035:49c7e0553ca5 parent: 17036:727ce97a96cd user: Merov Linden date: Thu Mar 24 20:15:33 2011 -0700 summary: STORM-1104 : pull into viewer-developement included in: 225035 changeset: 17036:727ce97a96cd parent: 17032:6c15f820c3b9 user: Kelly Washington date: Tue Mar 22 10:14:45 2011 -0700 summary: ER-320 Fix public urls in top scripts. codeticket: 224978 codeticket: 224967 codeticket: 224966 included in: 225035 changeset: 17032:6c15f820c3b9 parent: 17031:c60223c99dbd parent: 17030:580ef56f84bd user: Oz Linden date: Thu Mar 24 07:48:06 2011 -0400 summary: merge changes for storm-1018 codeticket: 224873 included in: 224978 included in: 224967 included in: 224966 changeset: 17030:580ef56f84bd parent: 17023:6de4b45ab61f user: eli_linden date: Wed Mar 23 11:40:02 2011 -0700 summary: INTL-30 WIP light viewer Set2 translations and new files for ES codeticket: 224836 included in: 224873 changeset: 17023:6de4b45ab61f parent: 17008:a8639217816b user: eli_linden date: Tue Mar 22 16:44:48 2011 -0700 summary: INTL-30 WIP light viewer Set2 translations and new files for FR, PT, DE Found Known Changeset: codeticket: 224965 codeticket: 224964 codeticket: 224682 included in: 224836 changeset: 17008:a8639217816b user: Oz Linden date: Mon Mar 21 08:48:04 2011 -0400 summary: update build parameters for Oz builds codeticket: 224981 included in: 224978 included in: 224967 included in: 224966 changeset: 17031:c60223c99dbd parent: 16666:ef2df52563bb user: Vadim ProductEngine date: Mon Mar 07 19:18:31 2011 +0200 summary: STORM-1018 FIXED Improved error messaging for the External Editor feature. Found Known Changeset: codeticket: 222712 included in: 224981 changeset: 16666:ef2df52563bb parent: 16664:ce883982e738 parent: 16665:6fdd6dfddec4 user: Merov Linden date: Thu Mar 03 23:25:03 2011 -0800 summary: STORM-969 : pull into viewer-development included in: 225035 changeset: 17035:49c7e0553ca5 parent: 17032:6c15f820c3b9 parent: 17034:a751abe375f3 user: Merov Linden date: Thu Mar 24 20:08:31 2011 -0700 summary: Pull from viewer-beta codeticket: 225008 included in: 225035 changeset: 17034:a751abe375f3 user: Richard Linden date: Tue Mar 22 16:57:21 2011 -0700 summary: SOCIAL-778 FIX Make how to web content wider included in: 225008 changeset: 17033:beddb3c73e2b parent: 16997:9e4641f4a787 user: Dessie Linden date: Mon Mar 21 15:03:43 2011 -0700 summary: Added tag DRTVWR-41_2.6.0-beta2, 2.6.0-beta2 for changeset 9e4641f4a787 Found Known Changeset: codeticket: 224672 included in: 225008 changeset: 16997:9e4641f4a787 tag: 2.6.0-beta2 tag: DRTVWR-41_2.6.0-beta2 parent: 16996:d403e8794544 parent: 16987:461c8c65b5c7 user: Oz Linden date: Sat Mar 19 15:20:33 2011 -0400 summary: merge changes for STORM-1089 codeticket: 224997 included in: 225042 changeset: 17029:0ba69511a9b2 parent: 17028:89071dd2e860 parent: 17027:86cdf13c9928 user: Leyla Farazha date: Thu Mar 24 12:32:33 2011 -0700 summary: Merge codeticket: 224977 codeticket: 224969 codeticket: 224968 included in: 224997 changeset: 17027:86cdf13c9928 user: prep date: Thu Mar 24 09:48:34 2011 -0400 summary: Crash fix for SH-1176 and WIP for pelvis z offset codeticket: 224871 included in: 224977 included in: 224969 included in: 224968 changeset: 17026:773a59f2ec8e parent: 17025:c1496c442016 parent: 17024:54fc4b85092e user: Leyla Farazha date: Wed Mar 23 11:36:00 2011 -0700 summary: Merge codeticket: 224861 included in: 224871 changeset: 17024:54fc4b85092e parent: 17020:9f520e38026e parent: 17023:6de4b45ab61f user: Loren Shih date: Wed Mar 23 12:40:22 2011 -0400 summary: Automated merge up from viewer-development into mesh-development Found Known Changeset: codeticket: 224822 included in: 224861 changeset: 17020:9f520e38026e parent: 17018:8c47d32039e9 parent: 17019:b12d0956380b user: Dave Parks date: Tue Mar 22 17:24:10 2011 -0500 summary: merge included in: 224871 changeset: 17025:c1496c442016 parent: 16634:e55dfe78c9bd user: Leyla Farazha date: Wed Mar 23 11:35:07 2011 -0700 summary: SH-1203 Remove "meshes" folder from inventory Found Known Changeset: codeticket: 223115 included in: 224871 changeset: 16634:e55dfe78c9bd user: Dave Parks date: Tue Mar 08 14:15:24 2011 -0600 summary: Make DoF focal point match behavior described in test plan at http://wiki.secondlife.com/wiki/Depth_of_Field_test included in: 224997 changeset: 17028:89071dd2e860 parent: 17026:773a59f2ec8e user: Leyla Farazha date: Thu Mar 24 12:31:24 2011 -0700 summary: SH-1205 Lock out ability to change sculpt stitching type or sculpt map when sculpt stitching type is set to mesh Found Known Changeset: codeticket: 224875 included in: 225046 changeset: 17022:ad4c572ef3d0 user: Nyx (Neal Orman) date: Wed Mar 23 16:01:12 2011 -0400 summary: second pass at render complexity debug display.