Ignored revisions: 12346
included in: 225589
changeset:   15178:52b2263ab28f
tag:         tip
parent:      15177:8357a9042310
parent:      15176:f3550319716b
user:        Oz Linden 
date:        Fri Apr 01 09:32:08 2011 -0400
summary:     merge changes for storm-1072

included in: 225589
changeset:   15176:f3550319716b
parent:      15175:1f0de238a517
parent:      15174:38b077cce901
user:        Oz Linden 
date:        Fri Apr 01 09:31:56 2011 -0400
summary:     merge changes for storm-399

codeticket:  225586
included in: 225589
changeset:   15174:38b077cce901
user:        Boroondas Gupte 
date:        Fri Apr 01 09:14:52 2011 -0400
summary:     VWR-24487 make PREHASH variables char const* const

codeticket:  225585
included in: 225586
changeset:   15173:ecfe51703b23
user:        Oz Linden 
date:        Fri Apr 01 06:49:19 2011 -0400
summary:     STORM-956 update message template

codeticket:  225565
included in: 225585
changeset:   15172:10e3209b07cd
parent:      15171:62c8346f53e0
parent:      15169:f6c69621c919
user:        Oz Linden 
date:        Thu Mar 31 21:23:09 2011 -0400
summary:     pull back beta tags

codeticket:  225525
included in: 225565
changeset:   15169:f6c69621c919
user:        Kelly Washington 
date:        Thu Mar 31 16:15:48 2011 -0700
summary:     Updated message template hash.

codeticket:  225517
codeticket:  225515
included in: 225525
changeset:   15168:92aff170d95e
user:        Christian Goetze (CG) 
date:        Thu Mar 31 15:43:47 2011 -0700
summary:     Apply server side code to message template verification onto the viewer tree.

included in: 225517
included in: 225515
changeset:   15167:e6662e8a2fd9
parent:      15166:988a05654fb2
parent:      15163:d30636c2a83a
user:        Kelly Washington 
date:        Thu Mar 31 14:07:54 2011 -0700
summary:     Merge

Found Known Changeset:
codeticket:  225446
included in: 225517
included in: 225515
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

Found Known Changeset:
codeticket:  225590
included in: 225517
included in: 225515
changeset:   15166:988a05654fb2
user:        Kelly Washington 
date:        Thu Mar 03 13:14:53 2011 -0800
summary:     Always do the template check, now that it is quick and local if it hasn't changed.

included in: 225565
changeset:   15171:62c8346f53e0
user:        Dessie Linden 
date:        Thu Mar 31 14:11:55 2011 -0700
summary:     Added tag DRTVWR-45_2.6.2-beta1, 2.6.2-beta1 for changeset d1203046bb65

codeticket:  225500
included in: 225565
changeset:   15170:3e39921db49c
parent:      15141:d962e7965cdc
parent:      15145:d1203046bb65
user:        Dessie Linden 
date:        Thu Mar 31 14:10:53 2011 -0700
summary:     merged in 2.6.2 Beta 1 code

Found Known Changeset:
codeticket:  225310
codeticket:  225236
included in: 225500
changeset:   15145:d1203046bb65
tag:         2.6.2-beta1
tag:         DRTVWR-45_2.6.2-beta1
parent:      15144:38a84eb71c21
parent:      15143:a5a57e7caef0
user:        Oz Linden 
date:        Tue Mar 29 16:00:39 2011 -0400
summary:     merge changes for storm-1097

Found Known Changeset:
codeticket:  225089
included in: 225500
changeset:   15141:d962e7965cdc
parent:      15106:a751abe375f3
parent:      15140:f5bb65583b91
user:        Oz Linden 
date:        Mon Mar 28 11:32:05 2011 -0400
summary:     merge late fix for SOCIAL-778 into 2.6.1 for release

included in: 225589
changeset:   15175:1f0de238a517
parent:      15100:a8639217816b
user:        Paul ProductEngine 
date:        Mon Mar 21 17:50:59 2011 +0200
summary:     STORM-399 FIXED Users that has chatted within chat range of the user in-world are not added to Recent tab

Found Known Changeset:
codeticket:  224965
codeticket:  224964
codeticket:  224682
included in: 225589
changeset:   15100:a8639217816b
user:        Oz Linden 
date:        Mon Mar 21 08:48:04 2011 -0400
summary:     update build parameters for Oz builds

included in: 225589
changeset:   15177:8357a9042310
parent:      15132:2ae060c0fa91
user:        Paul ProductEngine 
date:        Tue Mar 29 13:57:24 2011 +0300
summary:     STORM-1072 FIXED [TRANSLATED BUT IN EN] in "Monde" > "Profil du lieu" > "? propos des terrains" > "R?glement" : "Estate / Full Region" is in english.

Found Known Changeset:
codeticket:  225095
included in: 225589
changeset:   15132:2ae060c0fa91
user:        eli_linden 
date:        Mon Mar 28 11:36:37 2011 -0700
summary:     SOCIAL-703 FIX fix name attribute for translated files