Ignored revisions: 12346 Ignoring 2311 ancestors included in old builds. included in: 220029 changeset: 14665:b575bde7d5e8 tag: tip parent: 14664:b5c3758a8079 parent: 14663:127f6fc35c12 user: Oz Linden date: Mon Jan 31 12:34:17 2011 -0500 summary: merge changes for storm-845 included in: 220029 changeset: 14663:127f6fc35c12 parent: 14662:45640415ef0d parent: 14661:80c054b156c8 user: Oz Linden date: Mon Jan 31 12:32:57 2011 -0500 summary: merge changes for storm-829 included in: 220029 changeset: 14661:80c054b156c8 parent: 14660:6f044de78d1d parent: 14659:41771155b350 user: Oz Linden date: Mon Jan 31 12:26:23 2011 -0500 summary: merge changes for storm-643 included in: 220029 changeset: 14659:41771155b350 parent: 14658:d9a5183dfb95 parent: 14657:691e3941d950 user: Oz Linden date: Mon Jan 31 12:25:35 2011 -0500 summary: merge changes for storm-351 codeticket: 219999 included in: 220029 changeset: 14657:691e3941d950 parent: 14655:fe7fe04ccc9a parent: 14656:57e9ad7b408c user: Oz Linden date: Sat Jan 29 15:35:54 2011 -0500 summary: Automated merge with file:///Users/oz/Work/V-D included in: 220029 changeset: 14658:d9a5183dfb95 parent: 14611:38ed1abd9cd9 user: paul_productengine date: Wed Jan 26 20:24:49 2011 +0200 summary: STORM-351 FIXED Scrolling flat list by mouse wheel changes zoom level in-world included in: 220029 changeset: 14660:6f044de78d1d parent: 14612:6094386369a0 user: Twisted Laws date: Wed Jan 26 19:22:42 2011 -0500 summary: Embed Minimap into the Nearby list of the People Sidebar included in: 220029 changeset: 14662:45640415ef0d parent: 14384:3d755de28394 user: Jonathan Yap date: Thu Jan 06 06:07:11 2011 -0500 summary: STORM-829 Viewer 2 does not parse /me in object Instant Messages included in: 220029 changeset: 14664:b5c3758a8079 parent: 14587:e3e61681fbd2 user: Jonathan Yap date: Mon Jan 24 16:22:03 2011 -0500 summary: STORM-845 Icon for nearby chat and nearby voice now is a down arrow when floater is open