Ignored revisions: 12346
included in: 225309
changeset: 15160:a8f868007986
tag: tip
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
codeticket: 225282
included in: 225309
changeset: 15159:6efa01a308b4
parent: 15158:bc377daf948f
parent: 15154:ee12851ce7d4
user: Oz Linden
date: Tue Mar 29 19:22:26 2011 -0400
summary: merge changes for storm-1019
included in: 225282
changeset: 15154:ee12851ce7d4
parent: 15153:d6928babbc75
parent: 15152:2e8df76f8dab
user: Oz Linden
date: Tue Mar 29 19:21:41 2011 -0400
summary: merge changes for storm-1086
included in: 225282
changeset: 15152:2e8df76f8dab
parent: 15151:bc4040a0caf1
parent: 15146:bd6451100baf
user: Oz Linden
date: Tue Mar 29 19:19:24 2011 -0400
summary: merge changes for storm-1077
included in: 225282
changeset: 15146:bd6451100baf
parent: 15145:d1203046bb65
parent: 15142:d6c9433b6589
user: Oz Linden
date: Tue Mar 29 19:17:29 2011 -0400
summary: pull back beta changes to viewer-development
included in: 225282
changeset: 15142:d6c9433b6589
parent: 15141:d962e7965cdc
parent: 15138:0803d9f7f304
user: Oz Linden
date: Tue Mar 29 19:17:22 2011 -0400
summary: pull back beta changes to viewer-development
Found Known Changeset:
codeticket: 225263
included in: 225282
changeset: 15138:0803d9f7f304
user: eli_linden
date: Tue Mar 29 14:53:23 2011 -0700
summary: VWR-24128 FIX ES
codeticket: 225089
included in: 225282
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: 225089
changeset: 15140:f5bb65583b91
parent: 15098:f210155527a9
user: Dessie Linden
date: Mon Mar 28 05:58:57 2011 -0700
summary: Added tag DRTVWR-43_2.6.1-beta1, 2.6.1-beta1 for changeset c5bdef3aaa27
included in: 225089
changeset: 15098:f210155527a9
user: Oz Linden
date: Mon Mar 21 08:41:11 2011 -0400
summary: Added tag 2.6.1-start for changeset c5bdef3aaa27
codeticket: 225081
codeticket: 224685
included in: 225089
changeset: 15097:c5bdef3aaa27
tag: 2.6.1-beta1
tag: 2.6.1-start
tag: DRTVWR-43_2.6.1-beta1
user: Oz Linden
date: Mon Mar 21 08:39:49 2011 -0400
summary: convert DOS line endings
Found Known Changeset:
codeticket: 224681
included in: 225081
included in: 224685
changeset: 15096:016f50a3b154
parent: 15095:122f52c65d95
parent: 15094:a7cd609391d6
user: Oz Linden
date: Mon Mar 21 07:00:20 2011 -0400
summary: merge changes for storm-1035
Found Known Changeset:
codeticket: 225008
included in: 225089
changeset: 15106:a751abe375f3
user: Richard Linden
date: Tue Mar 22 16:57:21 2011 -0700
summary: SOCIAL-778 FIX Make how to web content wider
codeticket: 225236
included in: 225282
changeset: 15145:d1203046bb65
parent: 15144:38a84eb71c21
parent: 15143:a5a57e7caef0
user: Oz Linden
date: Tue Mar 29 16:00:39 2011 -0400
summary: merge changes for storm-1097
codeticket: 225085
included in: 225236
changeset: 15143:a5a57e7caef0
parent: 15140:f5bb65583b91
parent: 15130:ace3bbbd4292
user: Dessie Linden
date: Mon Mar 28 06:10:47 2011 -0700
summary: merged pre-beta and development versions of .hgtags
included in: 225085
changeset: 15130:ace3bbbd4292
user: Oz Linden
date: Mon Mar 28 08:55:04 2011 -0400
summary: Added tag 2.6.2-start for changeset 56b2778c743c
Found Known Changeset:
codeticket: 225079
included in: 225085
changeset: 15129:56b2778c743c
tag: 2.6.2-start
parent: 15128:5ff914ac5822
parent: 15115:65ff7415f171
user: Oz Linden
date: Sun Mar 27 21:45:43 2011 -0400
summary: merge changes for storm-987
included in: 225236
changeset: 15144:38a84eb71c21
parent: 15100:a8639217816b
user: Seth ProductEngine
date: Tue Mar 22 23:07:33 2011 +0200
summary: STORM-1097 FIXED opening the floater containing a detached side bar tab.
Found Known Changeset:
codeticket: 224965
codeticket: 224964
codeticket: 224682
included in: 225236
changeset: 15100:a8639217816b
user: Oz Linden
date: Mon Mar 21 08:48:04 2011 -0400
summary: update build parameters for Oz builds
included in: 225282
changeset: 15151:bc4040a0caf1
user: Jonathan Yap
date: Thu Mar 24 13:57:57 2011 -0400
summary: STORM-1077 Removed disabling speak hint on mouse up of speak button
included in: 225282
changeset: 15150:ac2c5096cf04
user: Jonathan Yap
date: Thu Mar 24 12:07:47 2011 -0400
summary: STORM-1077 Change hint wording. Disable hint if speak or flyout button is pressed.
included in: 225282
changeset: 15149:e34c46682d97
user: Jonathan Yap
date: Wed Mar 23 20:48:53 2011 -0400
summary: STORM-1077 Eliminated separator bar between Speak Button and other menu entries.
included in: 225282
changeset: 15148:4bbabc3624e5
user: Jonathan Yap
date: Wed Mar 16 18:34:59 2011 -0400
summary: STORM-1077 Fix setting for Sit hint, changed by accident during testing
included in: 225282
changeset: 15147:61be19577b6f
parent: 14862:b761ed94eb26
user: Jonathan Yap
date: Wed Mar 16 18:32:28 2011 -0400
summary: STORM-1077 Change "Voice Enabled/Disabled" to "Speak Button"
Found Known Changeset:
codeticket: 223751
included in: 225282
changeset: 14862:b761ed94eb26
parent: 14860:439fc3a274d8
parent: 14861:78d1d228709c
user: Oz Linden
date: Mon Mar 14 19:51:04 2011 -0400
summary: pull 2.5.2-release tag back
included in: 225282
changeset: 15153:d6928babbc75
parent: 15076:039e1f72b314
user: Seth ProductEngine
date: Fri Mar 18 00:28:48 2011 +0200
summary: STORM-1086 FIXED Agent's own calling card created on startup is placed into Calling Cards folder.
Found Known Changeset:
codeticket: 224500
codeticket: 224412
included in: 225282
changeset: 15076:039e1f72b314
parent: 15075:a8f13b31b38b
parent: 15074:6ed95486d3ec
user: Oz Linden
date: Thu Mar 17 14:56:01 2011 -0400
summary: merge changes for storm-1016
included in: 225282
changeset: 15158:bc377daf948f
parent: 15157:f07d6caf2325
parent: 15082:152fbd163f10
user: Jonathan Yap
date: Sat Mar 19 16:29:32 2011 -0400
summary: STORM-1019 Resolve merge conflicts
Found Known Changeset:
codeticket: 224657
included in: 225282
changeset: 15082:152fbd163f10
user: Oz Linden
date: Fri Mar 18 20:59:10 2011 -0400
summary: set build parameters for open dev projects
codeticket: 225278
codeticket: 225276
included in: 225282
changeset: 15157:f07d6caf2325
user: Jonathan Yap
date: Sat Mar 12 11:43:20 2011 -0500
summary: STORM-1019 Fixed problem with beacon message display and changed beacon message order to corresponed with menu order per Ardy Lay's suggestion
included in: 225278
included in: 225276
changeset: 15156:705d21b5235f
user: Jonathan Yap
date: Thu Feb 24 14:16:03 2011 -0500
summary: STORM-1019 Minor adjustment to media beacon name
included in: 225278
included in: 225276
changeset: 15155:aa8a5abaf6df
parent: 14755:1bc100746447
user: Robin Cornelius
date: Wed Feb 23 15:50:55 2011 -0500
summary: STORM-1019 Add ability to display beacons for Media on a Prim objects
Found Known Changeset:
codeticket: 221902
included in: 225278
included in: 225276
changeset: 14755:1bc100746447
user: Xiaohong Bao
date: Wed Feb 23 11:41:13 2011 -0700
summary: separate vertex buffer and index buffer when map/unmap VBO. can be treated as part of STORM-1011.
Found Known Changeset:
codeticket: 225272
included in: 225309
changeset: 15139:15bc529e9776
user: eli_linden
date: Tue Mar 29 16:09:32 2011 -0700
summary: INTL-34 WIP Set22 translations DE ES