Ignored revisions: 12346
included in: 226034
changeset:   15699:581180d13a96
tag:         tip
parent:      15698:2af9c1443501
parent:      15697:eb2428188944
user:        Oz Linden 
date:        Fri Apr 08 10:50:41 2011 -0400
summary:     merge changes for storm-1118

included in: 226034
changeset:   15697:eb2428188944
parent:      15696:b423adc047e9
parent:      15694:cd6d13e8450f
user:        Oz Linden 
date:        Fri Apr 08 10:50:18 2011 -0400
summary:     merge changes for storm-610

included in: 226034
changeset:   15694:cd6d13e8450f
parent:      15693:488a512b9641
parent:      15692:96a8f5f231da
user:        Oz Linden 
date:        Fri Apr 08 10:49:21 2011 -0400
summary:     merge changes for storm-1101

included in: 226034
changeset:   15692:96a8f5f231da
parent:      15691:7bcb336642f4
parent:      15689:2274d685a42d
user:        Oz Linden 
date:        Fri Apr 08 10:48:37 2011 -0400
summary:     merge changes for viewer-development-storm-954

included in: 226034
changeset:   15689:2274d685a42d
parent:      15688:aa7b856c9777
parent:      15687:b4295b28f616
user:        Oz Linden 
date:        Fri Apr 08 10:48:02 2011 -0400
summary:     merge changes for storm-1098

included in: 226034
changeset:   15687:b4295b28f616
parent:      15686:0270d4cdf1cc
parent:      15685:80645bbfbcba
user:        Oz Linden 
date:        Fri Apr 08 10:47:08 2011 -0400
summary:     merge changes for storm-1110

included in: 226034
changeset:   15685:80645bbfbcba
parent:      15684:294d87300771
parent:      15683:16b47a44a28b
user:        Oz Linden 
date:        Fri Apr 08 10:46:09 2011 -0400
summary:     merge changes for storm-1117

included in: 226034
changeset:   15683:16b47a44a28b
parent:      15682:5cc19277edef
parent:      15680:86fdc195e665
user:        Oz Linden 
date:        Fri Apr 08 10:45:28 2011 -0400
summary:     merge changes for storm-1057

included in: 226034
changeset:   15680:86fdc195e665
parent:      15679:684b6a483ff6
parent:      15678:33ca961b0870
user:        Oz Linden 
date:        Fri Apr 08 10:30:15 2011 -0400
summary:     merge changes for storm-250

Found Known Changeset:
codeticket:  226032
codeticket:  225890
codeticket:  225815
codeticket:  225759
included in: 226034
changeset:   15678:33ca961b0870
parent:      15677:34aaa302fc23
parent:      15622:3fc9a496265c
user:        Oz Linden 
date:        Tue Apr 05 07:23:43 2011 -0400
summary:     merge changes for STORM-1051

included in: 226034
changeset:   15679:684b6a483ff6
parent:      15069:d32171ae1288
user:        Seth ProductEngine 
date:        Tue Mar 15 18:23:20 2011 +0200
summary:     STORM-250 FIXED "More" link being toggled in expandable textbox after reshaping.

Found Known Changeset:
codeticket:  224267
included in: 226034
changeset:   15069:d32171ae1288
parent:      15068:9ad17c25c1bf
parent:      15067:a546c64a6b3c
user:        Oz Linden 
date:        Thu Mar 17 10:18:03 2011 -0400
summary:     Automated merge with file:///Users/oz/Work/V-PB

included in: 226034
changeset:   15682:5cc19277edef
parent:      15681:f81c24c215b3
parent:      15163:d30636c2a83a
user:        Paul ProductEngine 
date:        Thu Mar 31 17:15:04 2011 +0300
summary:     Merge

Found Known Changeset:
codeticket:  225446
included in: 226034
changeset:   15163:d30636c2a83a
parent:      15160:a8f868007986
parent:      15162:b24452faccb7
user:        Dessie Linden 
date:        Wed Mar 30 17:46:51 2011 -0700
summary:     merged .hgtags from viewer-release

included in: 226034
changeset:   15681:f81c24c215b3
parent:      15109:9547c65860a5
user:        Paul ProductEngine 
date:        Fri Mar 25 21:10:50 2011 +0200
summary:     STORM-1057 FIXED [TRUNCATION/LAYOUT] Make space larger for full strings to appear in the Move & View Preferences, ALL langs

Found Known Changeset:
codeticket:  225035
included in: 226034
changeset:   15109:9547c65860a5
parent:      15107:49c7e0553ca5
parent:      15108:727ce97a96cd
user:        Merov Linden 
date:        Thu Mar 24 20:15:33 2011 -0700
summary:     STORM-1104 : pull into viewer-developement

included in: 226034
changeset:   15684:294d87300771
parent:      15160:a8f868007986
user:        Seth ProductEngine 
date:        Wed Mar 30 23:42:13 2011 +0300
summary:     STORM-1117 FIXED Disabled placing calling cards in prims inventory.

Found Known Changeset:
codeticket:  225309
included in: 226034
changeset:   15160:a8f868007986
parent:      15139:15bc529e9776
parent:      15159:6efa01a308b4
user:        Oz Linden 
date:        Tue Mar 29 19:32:41 2011 -0400
summary:     Automated merge with file:///Users/oz/Work/V-D

included in: 226034
changeset:   15686:0270d4cdf1cc
parent:      15163:d30636c2a83a
user:        Paul ProductEngine 
date:        Thu Mar 31 21:03:41 2011 +0300
summary:     STORM-1110 FIXED Remove old 1.23 purple text from alerts, anywhere else it appears

Found Known Changeset:
codeticket:  225446
included in: 226034
changeset:   15163:d30636c2a83a
parent:      15160:a8f868007986
parent:      15162:b24452faccb7
user:        Dessie Linden 
date:        Wed Mar 30 17:46:51 2011 -0700
summary:     merged .hgtags from viewer-release

included in: 226034
changeset:   15688:aa7b856c9777
parent:      15622:3fc9a496265c
user:        Wolfpup Lowenhar
date:        Tue Apr 05 12:37:03 2011 -0400
summary:     STORM-1098 : Made change to debug setting description for ShowNetStatus

Found Known Changeset:
codeticket:  225716
codeticket:  225687
included in: 226034
changeset:   15622:3fc9a496265c
parent:      15621:d7fcefabdf32
parent:      15617:13670741a0a8
user:        Oz Linden 
date:        Mon Apr 04 15:35:58 2011 -0400
summary:     pull back late-breaking beta fixes

included in: 226034
changeset:   15691:7bcb336642f4
user:        Twisted Laws twisted_laws@hotmail.com
date:        Thu Mar 31 16:46:25 2011 -0400
summary:     Storm 954 - corrected use of braces

included in: 226034
changeset:   15690:e34d4e6134e2
parent:      14833:aed94e854443
user:        Twisted Laws twisted_laws@hotmail.com
date:        Wed Mar 09 17:59:59 2011 -0500
summary:     STORM-954 patch correction

Found Known Changeset:
codeticket:  223245
codeticket:  223244
included in: 226034
changeset:   14833:aed94e854443
parent:      14826:73f42030a5c5
parent:      14832:bae554c60420
user:        Merov Linden 
date:        Wed Mar 09 11:56:34 2011 -0800
summary:     Crash hunters: pull in viewer-development

included in: 226034
changeset:   15693:488a512b9641
parent:      15102:580ef56f84bd
user:        Jonathan Yap
date:        Wed Mar 23 14:55:28 2011 -0400
summary:     STORM-1101 Using the -login parameter makes some keys and right click menus not work

Found Known Changeset:
codeticket:  224873
included in: 226034
changeset:   15102:580ef56f84bd
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

included in: 226034
changeset:   15696:b423adc047e9
user:        Merov Linden 
date:        Wed Apr 06 14:51:00 2011 -0700
summary:     STORM-610 : Fix init of and default color value

included in: 226034
changeset:   15695:72473a9bef1f
parent:      15678:33ca961b0870
user:        Merov Linden 
date:        Tue Apr 05 22:58:53 2011 -0700
summary:     STORM-610 : Changes to water color and density in the Environment Editor now persist between sessions.

Found Known Changeset:
codeticket:  226032
codeticket:  225890
codeticket:  225815
codeticket:  225759
included in: 226034
changeset:   15678:33ca961b0870
parent:      15677:34aaa302fc23
parent:      15622:3fc9a496265c
user:        Oz Linden 
date:        Tue Apr 05 07:23:43 2011 -0400
summary:     merge changes for STORM-1051

included in: 226034
changeset:   15698:2af9c1443501
parent:      15678:33ca961b0870
user:        Vadim ProductEngine 
date:        Fri Apr 08 02:25:32 2011 +0300
summary:     STORM-1118 FIXED STORM-1118 Viewer crashes when user tries to upload image without JFIF header.

Found Known Changeset:
codeticket:  226032
codeticket:  225890
codeticket:  225815
codeticket:  225759
included in: 226034
changeset:   15678:33ca961b0870
parent:      15677:34aaa302fc23
parent:      15622:3fc9a496265c
user:        Oz Linden 
date:        Tue Apr 05 07:23:43 2011 -0400
summary:     merge changes for STORM-1051