Ignored revisions: 12346 codeticket: 224412 included in: 224500 changeset: 15076:039e1f72b314 tag: tip parent: 15075:a8f13b31b38b parent: 15074:6ed95486d3ec user: Oz Lindendate: Thu Mar 17 14:56:01 2011 -0400 summary: merge changes for storm-1016 included in: 224412 changeset: 15074:6ed95486d3ec parent: 15073:6f839f59ac3e parent: 15070:86fe2aea7a04 user: Oz Linden date: Thu Mar 17 14:49:03 2011 -0400 summary: Automated merge with ssh://hg.lindenlab.com/richard/viewer-social codeticket: 224285 included in: 224412 changeset: 15070:86fe2aea7a04 user: Oz Linden date: Thu Mar 17 12:25:28 2011 -0400 summary: remove unused configurations, modify my review build configuration Found Known Changeset: codeticket: 224267 included in: 224285 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: 224412 changeset: 15073:6f839f59ac3e user: Richard Linden date: Tue Mar 15 13:36:23 2011 -0700 summary: eol fixes codeticket: 223969 included in: 224412 changeset: 15072:ecd03f1df799 parent: 15071:132c0ded2930 parent: 15059:ed62e8e11283 user: Leyla Farazha date: Tue Mar 15 12:02:58 2011 -0700 summary: Merge Found Known Changeset: codeticket: 223936 included in: 223969 changeset: 15059:ed62e8e11283 parent: 15057:48a460f6e386 user: Richard Linden date: Tue Mar 15 09:54:17 2011 -0700 summary: another attempt at fixing gcc included in: 223969 changeset: 15071:132c0ded2930 parent: 15049:82e60b0b7422 user: Leyla Farazha date: Tue Mar 15 11:37:03 2011 -0700 summary: SOCIAL-744 User cannot close Destination Guide and Avatar picker by clicking the respective buttons while open Found Known Changeset: codeticket: 223778 included in: 223969 changeset: 15049:82e60b0b7422 parent: 15048:0b3151d90dbb parent: 15047:00716d6b9d0d user: Leyla Farazha date: Mon Mar 14 17:23:14 2011 -0700 summary: Merge included in: 224412 changeset: 15075:a8f13b31b38b parent: 14798:ef2df52563bb user: Vadim ProductEngine date: Fri Mar 04 19:26:07 2011 +0200 summary: STORM-1016 FIXED Crash after pressing ctrl-shift-w while there is an undocked sidepanel. Found Known Changeset: codeticket: 222712 included in: 224412 changeset: 14798:ef2df52563bb parent: 14796:ce883982e738 parent: 14797:6fdd6dfddec4 user: Merov Linden date: Thu Mar 03 23:25:03 2011 -0800 summary: STORM-969 : pull into viewer-development