completed: Fri Jan 07 05:10:07 2011
. [ default ] . changeset: 14424:3a6baa028c7c . tag: tip . parent: 14390:cf09cfdae607 . parent: 14423:7fe6d32a195c . user: Oz Linden <oz@lindenlab.com> . date: Thu Jan 06 21:38:05 2011 -0500 . summary: Automated merge with file:///Users/oz/Work/V-D . . [ default ] . . changeset: 14423:7fe6d32a195c . . parent: 14422:464450764bc3 . . parent: 14396:eb142fb8cf23 . . user: Oz Linden <oz@lindenlab.com> . . date: Thu Jan 06 19:20:54 2011 -0500 . . summary: merge changes for web profiles . . . [ default ] . . . changeset: 14396:eb142fb8cf23 . . . parent: 14395:0bf2a71b49e2 . . . parent: 14394:649225f03511 . . . user: Oz Linden <oz@lindenlab.com> . . . date: Thu Jan 06 14:33:35 2011 -0500 . . . summary: merge changes for storm-812 . . . . [ default ] . . . . changeset: 14394:649225f03511 . . . . parent: 14393:925db607bf1c . . . . parent: 14392:1adbbfe86638 . . . . user: Oz Linden <oz@lindenlab.com> . . . . date: Thu Jan 06 14:32:01 2011 -0500 . . . . summary: merge changes for storm-714 . . . . . [ default ] . . . . . changeset: 14392:1adbbfe86638 . . . . . parent: 14391:f1d1b8d67c01 . . . . . parent: 14389:6d44f0d85a80 . . . . . user: Oz Linden <oz@lindenlab.com> . . . . . date: Thu Jan 06 14:31:17 2011 -0500 . . . . . summary: merge changes for storm-438 . . . . . changeset: 14391:f1d1b8d67c01 . . . . . parent: 14316:d8fef72af99e . . . . . user: Paul Guslisty <pguslisty@productengine.com> . . . . . date: Thu Dec 23 14:52:57 2010 +0200 . . . . . summary: STORM-438 FIXED My inventory floater is not restored if it was minimized and 'Open Attachment' button was pressed in the Group Profile. . . . . [ default ] . . . . changeset: 14393:925db607bf1c . . . . parent: 14337:940cd25d4b78 . . . . user: Paul Guslisty <pguslisty@productengine.com> . . . . date: Tue Dec 28 19:02:49 2010 +0200 . . . . summary: STORM-714 FIXED Webprim's control bar doesn't dissapear after switching to mouselook mode . . . [ default ] . . . changeset: 14395:0bf2a71b49e2 . . . parent: 14316:d8fef72af99e . . . user: Jonathan Yap . . . date: Thu Dec 23 17:12:37 2010 -0500 . . . summary: STORM-812 Make bottom buttons in Object Profile identical for single and multi-prim objects . . [ default ] . . changeset: 14422:464450764bc3 . . user: callum . . date: Thu Jan 06 13:41:04 2011 -0800 . . summary: SOCIAL-423 FIX Display name and username are wrong in My Profile tab . . changeset: 14421:28f47e5f5c96 . . user: Brad Payne (Vir Linden) <vir@lindenlab.com> . . date: Thu Jan 06 16:31:27 2011 -0500 . . summary: Validation check for edit classified and edit pick slapps . . changeset: 14420:e3dd2e9b5bd2 . . parent: 14419:d4e06124b6f3 . . parent: 14389:6d44f0d85a80 . . user: callum . . date: Thu Jan 06 10:59:41 2011 -0800 . . summary: Merge from viewer-development before merge to viewer-development request submitted . . changeset: 14419:d4e06124b6f3 . . parent: 14418:c54ec20be65a . . parent: 14384:3d755de28394 . . user: callum . . date: Wed Jan 05 15:52:43 2011 -0800 . . summary: Merge with viewer-development . . changeset: 14418:c54ec20be65a . . user: callum . . date: Wed Jan 05 15:49:57 2011 -0800 . . summary: SOCIAL-304 FIX Modify side panel to reflect Profiles changes . . changeset: 14417:ded3f296221b . . user: callum . . date: Wed Dec 29 13:37:46 2010 -0800 . . summary: SOCIAL-401 FIX Change default web profiles URL to something closer to what will be released . . changeset: 14416:e026bd9cc0a7 . . user: callum . . date: Wed Dec 29 13:36:34 2010 -0800 . . summary: SOCIAL-403 FIX Update button graphic that opens Web profiles . . changeset: 14415:2ae518cc9e4f . . user: callum . . date: Wed Dec 29 13:35:23 2010 -0800 . . summary: SOCIAL-405 FIX Always make Web profiles open in internal Web content floater regardless of prefs . . changeset: 14414:1c5d8d64ee4f . . parent: 14413:9bdb34108dc5 . . parent: 14261:5d69e36a53ee . . user: callum . . date: Wed Dec 22 15:22:43 2010 -0800 . . summary: Merge with tip of viewer-development . . changeset: 14413:9bdb34108dc5 . . user: prep <prep@lindenlab.com> . . date: Thu Dec 09 12:59:27 2010 -0500 . . summary: Social-166 . . changeset: 14412:62f076052c14 . . user: Brad Payne (Vir Linden) <vir@lindenlab.com> . . date: Tue Dec 07 16:57:52 2010 -0500 . . summary: more merge from viewer-development . . changeset: 14411:f94cb6b80233 . . parent: 14410:1b19471dbac0 . . parent: 13866:f9a293612eea . . user: Brad Payne (Vir Linden) <vir@lindenlab.com> . . date: Tue Dec 07 15:05:57 2010 -0500 . . summary: merge viewer-development into web-profiles . . changeset: 14410:1b19471dbac0 . . user: prep linden <prep@lindenlab.com> . . date: Mon Nov 22 16:28:17 2010 -0500 . . summary: WIP avatar properties persist from preference window . . changeset: 14409:78ee3ef9351c . . user: prep linden <prep@lindenlab.com> . . date: Thu Nov 18 16:22:25 2010 -0500 . . summary: misc cleanup . . changeset: 14408:eb063809050d . . user: prep linden <prep@lindenlab.com> . . date: Thu Nov 18 16:14:20 2010 -0500 . . summary: XML fixup . . changeset: 14407:e3ebae9c7264 . . user: prep linden <prep@lindenlab.com> . . date: Thu Nov 18 16:05:35 2010 -0500 . . summary: Move include in search results from profile window to preference privacy pane . . changeset: 14406:ac8fc19d3f7b . . parent: 14405:c201cac4df01 . . parent: 14402:586ab2453093 . . user: Brad Payne (Vir Linden) <vir@lindenlab.com> . . date: Fri Oct 22 11:37:20 2010 -0400 . . summary: merge . . . [ default ] . . . changeset: 14402:586ab2453093 . . . user: prep linden <prep@lindenlab.com> . . . date: Thu Oct 21 16:22:27 2010 -0400 . . . summary: Added support for map tracking slapp, share slapp and a voice call slapp. . . . changeset: 14401:062f057119ae . . . user: prep linden <prep@lindenlab.com> . . . date: Thu Oct 21 16:08:13 2010 -0400 . . . summary: Added support for map tracking slapp, share slapp and a voice call slapp. . . . changeset: 14400:3c8d0aeecd9e . . . user: prep linden <prep@lindenlab.com> . . . date: Thu Oct 21 15:57:06 2010 -0400 . . . summary: Added support for map tracking slapp, share slapp and a voice call slapp. . . . changeset: 14399:93f78364d59b . . . parent: 14397:4f255ba1cfa4 . . . user: prep linden <prep@lindenlab.com> . . . date: Thu Oct 21 13:26:13 2010 -0400 . . . summary: secondlife:///app/maptrackavatar/lluid . . . changeset: 14397:4f255ba1cfa4 . . . parent: 12606:d5f123f1f058 . . . user: Brad Payne (Vir Linden) <vir@lindenlab.com> . . . date: Tue Oct 12 08:43:16 2010 -0400 . . . summary: Initial hooks for web profiles support . . [ default ] . . changeset: 14405:c201cac4df01 . . user: Brad Payne (Vir Linden) <vir@lindenlab.com> . . date: Fri Oct 22 11:35:58 2010 -0400 . . summary: SOCIAL-84 FIX, SOCIAL-85 FIX - new slapps for edit classified, create and edit pick . . changeset: 14404:f07c6b0a37d0 . . user: Brad Payne (Vir Linden) <vir@lindenlab.com> . . date: Thu Oct 21 14:41:42 2010 -0400 . . summary: support for edit classified slapp . . changeset: 14403:33780ad3705a . . parent: 14398:adf821756b63 . . user: Brad Payne (Vir Linden) <vir@lindenlab.com> . . date: Wed Oct 20 17:03:36 2010 -0400 . . summary: SOCIAL-84, SOCIAL-85 WIP . . changeset: 14398:adf821756b63 . . user: Brad Payne (Vir Linden) <vir@lindenlab.com> . . date: Mon Oct 18 18:11:29 2010 -0400 . . summary: consolidate generating profile URL, force to lower case . [ default ] . changeset: 14390:cf09cfdae607 . user: David Kaprielian <sabin@lindenlab.com> . date: Thu Jan 06 13:08:00 2011 -0800 . summary: Syncing coverity build.sh code with trunk.