Ignored revisions: 12346 Ignoring 2192 ancestors included in old builds. included in: 219657 changeset: 14629:223ded057e8e tag: tip parent: 14628:fad842764943 parent: 14627:deb605ec4bdb user: Oz Linden date: Tue Jan 25 17:53:11 2011 -0500 summary: merge changes for storm-643 included in: 219657 changeset: 14627:deb605ec4bdb parent: 14626:38ed1abd9cd9 parent: 14625:6f1dc1096572 user: Oz Linden date: Tue Jan 25 17:50:17 2011 -0500 summary: Automated merge with file:///Users/oz/Work/V-D included in: 219657 changeset: 14625:6f1dc1096572 parent: 14624:b5c3758a8079 parent: 14623:e135100a60b5 user: Oz Linden date: Tue Jan 25 17:49:32 2011 -0500 summary: merge changes for storm-845 included in: 219657 changeset: 14623:e135100a60b5 parent: 14622:e2344d4454c4 parent: 14620:6644d4e0337b user: Oz Linden date: Tue Jan 25 17:48:50 2011 -0500 summary: merge changes for storm-843 included in: 219657 changeset: 14620:6644d4e0337b parent: 14619:3288aca19f87 parent: 14618:b1be649335de user: Oz Linden date: Tue Jan 25 17:47:53 2011 -0500 summary: merge changes for storm-547 included in: 219657 changeset: 14618:b1be649335de parent: 14617:a9358961d580 parent: 14616:a3c1a2ecdbc5 user: Oz Linden date: Tue Jan 25 17:47:23 2011 -0500 summary: merge changes for storm-465 included in: 219657 changeset: 14616:a3c1a2ecdbc5 parent: 14615:63453b39d69e parent: 14614:88da7d29ad92 user: Oz Linden date: Tue Jan 25 17:46:46 2011 -0500 summary: merge changes for storm-373 included in: 219657 changeset: 14614:88da7d29ad92 parent: 14613:77a7a592c318 parent: 14612:c58b112064fc user: Oz Linden date: Tue Jan 25 17:46:11 2011 -0500 summary: merge changes for storm-348 included in: 219657 changeset: 14612:c58b112064fc parent: 14611:5bef2be3c4db parent: 14594:180c8272f58e user: Oz Linden date: Tue Jan 25 17:45:33 2011 -0500 summary: merge changes for storm-236 codeticket: 219505 included in: 219657 changeset: 14594:180c8272f58e parent: 14593:b1ba2bd8309f parent: 14588:586e1cd79607 user: Oz Linden date: Mon Jan 24 14:22:08 2011 -0500 summary: merge changes for beta fixes included in: 219505 changeset: 14588:586e1cd79607 user: Aleric Inglewood date: Mon Jan 24 09:35:41 2011 -0500 summary: VWR-24321: fix validation of textures that start with 00 codeticket: 219436 included in: 219505 changeset: 14587:e3e61681fbd2 user: Oz Linden date: Fri Jan 21 16:20:29 2011 -0500 summary: add missing entry in contributions.txt for VWR-24347 included in: 219436 changeset: 14586:e2cf635db691 user: Aleric Inglewood date: Fri Jan 21 16:02:38 2011 -0500 summary: VWR-24519: make debugging easier by not spawning spare process included in: 219436 changeset: 14585:2d0799e918c5 parent: 14584:935381a4eab5 parent: 14583:87006f3ba82d user: Oz Linden date: Fri Jan 21 15:55:55 2011 -0500 summary: merge changes for vwr-24347 included in: 219436 changeset: 14583:87006f3ba82d user: Aleric Inglewood date: Fri Jan 21 15:48:12 2011 -0500 summary: VWR-24354: correct manifest dependencies to prevent parallel install problem codeticket: 219427 included in: 219436 changeset: 14582:c9fff5355807 parent: 14581:887c9baf5034 parent: 14578:faf2d8c8bf7b user: Oz Linden date: Fri Jan 21 15:29:40 2011 -0500 summary: merge changes for storm-844 included in: 219427 changeset: 14578:faf2d8c8bf7b parent: 14577:743a85de0bc5 parent: 14576:9acbdea99665 user: Oz Linden date: Fri Jan 21 15:14:39 2011 -0500 summary: merge changes for storm-869 included in: 219427 changeset: 14576:9acbdea99665 parent: 14575:145b2cd42ef3 parent: 14574:453bcacca4e7 user: Oz Linden date: Fri Jan 21 15:11:20 2011 -0500 summary: merge changes for storm-874/ER-428: fix lost movement updates when walking codeticket: 219419 included in: 219427 changeset: 14574:453bcacca4e7 parent: 14573:67301a0cd827 parent: 14572:9618d6a96df0 user: Oz Linden date: Fri Jan 21 07:23:48 2011 -0500 summary: merge changes for storm-715 included in: 219419 changeset: 14572:9618d6a96df0 parent: 14571:595e360b9668 parent: 14570:f0d83fc6caa3 user: Oz Linden date: Fri Jan 21 07:22:37 2011 -0500 summary: merge changes for storm-832 included in: 219419 changeset: 14570:f0d83fc6caa3 parent: 14569:3d368f4865f2 parent: 14568:29376214d853 user: Oz Linden date: Fri Jan 21 07:21:51 2011 -0500 summary: merge changes for storm-834 included in: 219419 changeset: 14568:29376214d853 parent: 14567:084b3c7be597 parent: 14566:7f45778d9476 user: Oz Linden date: Fri Jan 21 07:20:54 2011 -0500 summary: merge changes for storm-484 included in: 219419 changeset: 14566:7f45778d9476 parent: 14565:11ab8fb993fd parent: 14564:92d3ae5896e9 user: Oz Linden date: Fri Jan 21 07:20:18 2011 -0500 summary: merge changes for storm-383 included in: 219419 changeset: 14564:92d3ae5896e9 parent: 14563:54d772d8687c parent: 14560:9c7d543fd15d user: Oz Linden date: Thu Jan 20 20:48:16 2011 -0500 summary: merge changes from viewer-beta codeticket: 219350 included in: 219419 changeset: 14560:9c7d543fd15d user: Aleric Inglewood date: Thu Jan 20 16:01:27 2011 -0500 summary: VWR-24320: remove dump of call stack on clean exit included in: 219350 changeset: 14559:baba912f76ba user: Aleric Inglewood date: Thu Jan 20 15:57:07 2011 -0500 summary: VWR-24317: remove warning due to unassigned variable included in: 219350 changeset: 14558:71019c7df263 user: Aleric Inglewood date: Thu Jan 20 15:52:37 2011 -0500 summary: VWR-24317: remove warning re: RenderCubeMap by deferring initialization included in: 219350 changeset: 14557:e84e802b355a user: Aleric Inglewood date: Thu Jan 20 15:03:48 2011 -0500 summary: VWR-24317: remove warning caused by reading the last line of the featuretable twice included in: 219350 changeset: 14556:54a67ecf7677 user: Aleric Inglewood date: Thu Jan 20 14:57:33 2011 -0500 summary: VWR-24317: remove warnings for deleting non-existant texture file on startup included in: 219350 changeset: 14555:7190a4bb1388 user: Aleric Inglewood date: Thu Jan 20 14:44:06 2011 -0500 summary: VWR-24317: clean up incorrect warnings prior to login in log file included in: 219350 changeset: 14554:ce6eaf841349 user: Aleric Inglewood date: Thu Jan 20 14:35:04 2011 -0500 summary: VWR-24315: update cached control values when resetting debug setting to default included in: 219350 changeset: 14553:06a8138fb9db user: Aleric Inglewood date: Thu Jan 20 14:26:57 2011 -0500 summary: VWR-13040 - clean up LLObjectSelection iterator codeticket: 219259 included in: 219350 changeset: 14552:40d0806e9800 parent: 14551:2b913f5363cd parent: 14546:eb63427658d6 user: Oz Linden date: Wed Jan 19 16:38:30 2011 -0500 summary: pulling tags back from beta branch codeticket: 219237 included in: 219259 changeset: 14546:eb63427658d6 parent: 14545:d9644fd43639 parent: 14540:e5a07d44e413 user: Oz Linden date: Wed Jan 19 12:48:04 2011 -0500 summary: pull changes back from beta codeticket: 219232 included in: 219237 changeset: 14540:e5a07d44e413 parent: 14539:ef4ebf2f43e1 parent: 14538:38465c40c060 user: Oz Linden date: Wed Jan 19 10:33:15 2011 -0500 summary: merge changes for storm-243 codeticket: 219167 included in: 219232 changeset: 14538:38465c40c060 parent: 14537:f7404307659e parent: 14535:58ced9d07d74 user: Merov Linden date: Tue Jan 18 11:47:04 2011 -0800 summary: Sync with viewer-beta included in: 219232 changeset: 14539:ef4ebf2f43e1 parent: 14528:422f636c3343 user: Vadim ProductEngine date: Tue Jan 18 18:46:35 2011 +0200 summary: STORM-243 FIXED Disabled the "You just entered a region using a different server version..." pop-up notification. codeticket: 219231 included in: 219237 changeset: 14545:d9644fd43639 user: Kent Quirk date: Wed Jan 19 10:28:39 2011 -0500 summary: STORM-725: add os to updater query url included in: 219231 changeset: 14544:246cf1a82f56 user: Oz Linden date: Tue Jan 18 15:59:45 2011 -0500 summary: remove problematic include used during debug codeticket: 219235 included in: 219231 changeset: 14543:7bb13ff360c2 user: Oz Linden date: Tue Jan 18 07:37:56 2011 -0500 summary: make storing the cache obey the same unrefreshed time as other usage included in: 219235 changeset: 14542:d42a47b9d75c user: Oz Linden date: Sun Jan 16 21:41:08 2011 -0500 summary: DN-202: Make avatar name caching more aggressive and error handling more uniform included in: 219235 changeset: 14541:ef7325507b30 parent: 14536:282a16c0bffb user: Oz Linden date: Sat Jan 15 09:09:41 2011 -0500 summary: renamed temp name flag member in name cache to avoid confusion with similar names in other classes codeticket: 219243 included in: 219259 changeset: 14551:2b913f5363cd parent: 14550:1d748bf37e22 parent: 14545:d9644fd43639 user: Dessie Linden date: Wed Jan 19 12:06:25 2011 -0800 summary: Removed accidental changeset id tag included in: 219243 changeset: 14550:1d748bf37e22 user: Dessie Linden date: Wed Jan 19 12:04:43 2011 -0800 summary: Removed tag 76f586a8e22b included in: 219243 changeset: 14549:ffdef3f18953 user: Dessie Linden date: Wed Jan 19 12:02:28 2011 -0800 summary: Added tag 76f586a8e22b, 2.5.0-beta1 for changeset 345b17e7cf63 included in: 219243 changeset: 14548:345b17e7cf63 tag: 2.5.0-beta1 user: Dessie Linden date: Wed Jan 19 12:01:44 2011 -0800 summary: Removed tag 76f586a8e22b included in: 219243 changeset: 14547:fbdc354c318d parent: 14436:76f586a8e22b user: Dessie Linden date: Wed Jan 19 12:00:58 2011 -0800 summary: Added tag 76f586a8e22b for changeset 76f586a8e22b codeticket: 219342 included in: 219419 changeset: 14563:54d772d8687c parent: 14562:253143a705f7 parent: 14561:dc98c6fb4445 user: Oz Linden date: Thu Jan 20 15:25:49 2011 -0500 summary: merge changes for chop-366 included in: 219342 changeset: 14561:dc98c6fb4445 parent: 14551:2b913f5363cd user: Kent Quirk date: Thu Jan 20 15:20:51 2011 -0500 summary: VWR-24426: fix SSL handshake error using webkit 4.7 codeticket: 219118 included in: 219342 changeset: 14562:253143a705f7 parent: 14436:76f586a8e22b user: Andrew A. de Laix date: Fri Jan 14 12:59:42 2011 -0800 summary: fix CHOP-366, on temporary errors (e.g. version manager returns other than 200) show error dialog instructing the user to manually install the latest viewer. codeticket: 219580 included in: 219419 changeset: 14565:11ab8fb993fd parent: 14528:422f636c3343 user: Seth ProductEngine date: Mon Jan 17 19:03:49 2011 +0200 summary: STORM-383 FIXED Added "Restore Item" context menu entry for landmarks and folders in Trash category in Places->My Landmarks->My Inventory accordion tab. included in: 219419 changeset: 14567:084b3c7be597 parent: 14528:422f636c3343 user: Paul Guslisty date: Mon Jan 17 18:01:55 2011 +0200 summary: STORM-484 FIXED The long name is not truncated in Build tools included in: 219419 changeset: 14569:3d368f4865f2 parent: 14525:6f8ba8196f6f user: Paul Guslisty date: Fri Jan 14 18:10:46 2011 +0200 summary: STORM-834 FIXED Color picker remains opened after 'Undo changes' button was pressed on 'Edit weareble' panel included in: 219419 changeset: 14571:595e360b9668 parent: 14487:5f4034c58817 user: Paul Guslisty date: Thu Jan 13 16:52:25 2011 +0200 summary: STORM-832 FIXED Two Roles are selected after made changes in one included in: 219419 changeset: 14573:67301a0cd827 parent: 14435:bceb13778d1d user: Vadim ProductEngine date: Tue Jan 11 18:55:22 2011 +0200 summary: STORM-715 FIXED Don't expand default ("Clothing") accordion tab when docking/undocking the Appearance SP. codeticket: 219252 included in: 219427 changeset: 14575:145b2cd42ef3 parent: 14538:38465c40c060 user: Dave SIMmONs date: Wed Jan 19 12:54:05 2011 -0800 summary: ER-428 / CTS-422 : [PUBLIC] movement updates are lost when walking. Changed code to detect if the circuit has stopped getting packets. Reviewed by Andrew included in: 219427 changeset: 14577:743a85de0bc5 parent: 14076:46a990f8296f user: Jonathan Yap date: Wed Jan 19 06:02:08 2011 -0500 summary: STORM-869 Minor irregulaties in settings.xml -- remove duplicate entries, formatting cleanup included in: 219427 changeset: 14581:887c9baf5034 user: Jonathan Yap date: Sun Jan 16 12:10:44 2011 -0500 summary: STORM-844 Better way of doing "More" should be "Less" when Media Control is open included in: 219427 changeset: 14580:4ab5890d9cd8 user: Jonathan Yap date: Wed Jan 12 10:37:15 2011 -0500 summary: STORM-844 Minor adjustment to contributions.txt included in: 219427 changeset: 14579:24a779325ec1 parent: 14462:179e0754a27d user: Jonathan Yap date: Wed Jan 12 08:24:38 2011 -0500 summary: STORM-844 "More" should be "Less" when Media Control is open included in: 219436 changeset: 14584:935381a4eab5 parent: 14355:27dae7b01a81 user: Jonathan Yap date: Wed Dec 29 18:25:40 2010 -0500 summary: VWR-24347 Fix reversion--allow VS2005 Express user to specify location of msvc* files codeticket: 219483 included in: 219505 changeset: 14593:b1ba2bd8309f parent: 14592:746172ee0da1 parent: 14563:54d772d8687c user: Oz Linden date: Mon Jan 24 11:44:43 2011 -0500 summary: merge changes for i18n fixes included in: 219483 changeset: 14592:746172ee0da1 user: Eli Linden date: Fri Jan 21 16:11:25 2011 -0800 summary: INTL-20,CT-635 WIP DE,FR,ES,PT,PL translation (new files) for Viewer 2.5 included in: 219483 changeset: 14591:f333637176da user: Eli Linden date: Fri Jan 21 16:11:09 2011 -0800 summary: INTL-20,CT-635 WIP DE,FR,ES,PT,PL translation for Viewer 2.5 included in: 219483 changeset: 14590:a1b37b733817 user: Eli Linden date: Wed Jan 19 12:16:34 2011 -0800 summary: sync up with Viewer 2.5 from viewer-beta included in: 219483 changeset: 14589:a5f747380ce9 parent: 13875:51860c70b3ed user: Eli Linden date: Wed Jan 19 12:16:23 2011 -0800 summary: sync up with Viewer 2.5 from viewer-beta codeticket: 219418 included in: 219657 changeset: 14611:5bef2be3c4db parent: 14560:9c7d543fd15d user: Wolfpup Lowenhar date: Thu Jan 20 21:41:56 2011 -0500 summary: STORM-236: Speak Button now follows Voice settings and will auto hide if Voice is not included in: 219657 changeset: 14613:77a7a592c318 parent: 14538:38465c40c060 user: Vadim ProductEngine date: Wed Jan 19 21:41:53 2011 +0200 summary: STORM-348 FIXED "Edit" and "Lock" buttons appearing on body part items in outfit editor before they are hovered with mouse. included in: 219657 changeset: 14615:63453b39d69e parent: 14538:38465c40c060 user: Vadim ProductEngine date: Wed Jan 19 13:30:05 2011 +0200 summary: STORM-373 FIXED "Rename" context menu option was disabled for incomplete inventory items. included in: 219657 changeset: 14617:a9358961d580 parent: 14552:40d0806e9800 user: Vadim ProductEngine date: Thu Jan 20 17:19:39 2011 +0200 summary: STORM-465 FIXED Fixed "Missing string" warning appearing when you press a key for which there's no translation (i.e. entry in strings.xml). included in: 219657 changeset: 14619:3288aca19f87 parent: 14538:38465c40c060 user: Paul Guslisty date: Wed Jan 19 13:55:39 2011 +0200 summary: STORM-547 FIXED Name of blocked person is not presented in list if person was blocked from Inspector included in: 219657 changeset: 14622:e2344d4454c4 user: Seth ProductEngine date: Tue Jan 25 01:13:39 2011 +0200 summary: STORM-843 FIXED incremental inventory search to use more restrictive or less restrictive filtering. included in: 219657 changeset: 14621:7e89d8f45f94 parent: 14610:26c09ad4293e user: Seth ProductEngine date: Tue Jan 25 01:28:46 2011 +0200 summary: Fixed TestCapabilityProvider build issue. codeticket: 219558 included in: 219657 changeset: 14610:26c09ad4293e parent: 14594:180c8272f58e parent: 14609:4c49eb90cd17 user: Xiaohong Bao date: Mon Jan 24 15:51:33 2011 -0700 summary: Automated merge with http://hg.secondlife.com/viewer-development included in: 219558 changeset: 14609:4c49eb90cd17 user: Xiaohong Bao date: Mon Jan 24 15:50:46 2011 -0700 summary: fix for SH-445: debug settings -> "CacheNumberOfRegionsForObjects" does not limit the number of object cache files included in: 219558 changeset: 14608:787dbfc37f0e parent: 14607:d41267ba94a2 parent: 14582:c9fff5355807 user: Xiaohong Bao date: Fri Jan 21 16:26:35 2011 -0700 summary: Merge included in: 219558 changeset: 14607:d41267ba94a2 parent: 14574:453bcacca4e7 parent: 14606:3bf724ecb7c6 user: Xiaohong Bao date: Fri Jan 21 16:25:23 2011 -0700 summary: Merge viewer-development-shining up to REV 3bf724ecb7c6 (fix for SH-829: Viewer attempting to load precached images in file types that are not being used.) codeticket: 219360 included in: 219558 changeset: 14606:3bf724ecb7c6 user: Xiaohong Bao date: Thu Jan 20 15:20:27 2011 -0700 summary: fix for SH-829: Viewer attempting to load precached images in file types that are not being used. codeticket: 219309 included in: 219360 changeset: 14605:347132b8214c user: Xiaohong Bao date: Wed Jan 19 21:17:38 2011 -0700 summary: fix for SH-730: sculpted prim attachment shapes on impostored avatars load very slowly codeticket: 219195 included in: 219309 changeset: 14604:7aadef5d0652 user: Xiaohong Bao date: Tue Jan 18 16:46:33 2011 -0700 summary: fix for SH-761: Texture Saving Does Not Work codeticket: 219181 included in: 219195 changeset: 14603:5218090cccc1 user: Xiaohong Bao date: Tue Jan 18 14:08:21 2011 -0700 summary: fix for SH-659: small textures not loaded included in: 219181 changeset: 14602:93d36bbfd793 user: Xiaohong Bao date: Tue Jan 18 10:41:37 2011 -0700 summary: debug tool to show texture info for SH-659: small textures not loaded. codeticket: 218672 included in: 219181 changeset: 14601:8876644cb519 user: Xiaohong Bao date: Fri Jan 07 15:04:36 2011 -0700 summary: trivial: for VWR-22353: remove debug code for EXT-6791. codeticket: 217834 included in: 218672 changeset: 14600:cd100ffbfe79 user: Xiaohong Bao date: Thu Dec 23 11:42:17 2010 -0700 summary: fix for SH-416: crash at LLFace::getGeometryVolume line 1003 codeticket: 217202 included in: 217834 changeset: 14599:ba63d96168c1 user: Xiaohong Bao date: Thu Dec 16 17:13:07 2010 -0700 summary: fix for SH-445: debug settings -> "CacheNumberOfRegionsForObjects" does not limit the number of object cache files included in: 217202 changeset: 14598:a71982e12fd9 user: Xiaohong Bao date: Wed Dec 15 17:34:18 2010 -0700 summary: fix for SH-446: viewer crashed after clearing cache and relogging included in: 217202 changeset: 14597:b601f1121f0f user: Xiaohong Bao date: Wed Dec 15 17:20:58 2010 -0700 summary: fix for SH-367: mesh viewer lock up: Problem removing object.cache - errorcode: 13 included in: 217202 changeset: 14596:cfa20aad776d user: Xiaohong Bao date: Tue Dec 14 12:16:39 2010 -0700 summary: a try fix for SH-212: crash at LLViewerObjectList::removeFromLocalIDTable(LLViewerObject const &) [secondlife-bin llviewerobjectlist.cpp] line 173 included in: 217202 changeset: 14595:cd68075130a2 parent: 13539:b0f2acfb3155 user: Xiaohong Bao date: Mon Dec 13 21:09:52 2010 -0700 summary: debug code for SH-639: http requests 3X more in viewer 2.4 included in: 219657 changeset: 14624: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 codeticket: 219652 included in: 219657 changeset: 14626:38ed1abd9cd9 parent: 14610:26c09ad4293e user: Vadim ProductEngine date: Tue Jan 25 17:10:23 2011 -0500 summary: correct build error included in: 219657 changeset: 14628:fad842764943 parent: 14610:26c09ad4293e user: Jonathan Yap date: Tue Jan 25 14:06:25 2011 -0500 summary: STORM-643 Embed Minimap into the Nearby list of the People Sidebar