Commit Graph

22485 Commits (9b2daf4b19fca22bd74aefab49ef41eb8e06c651)

Author SHA1 Message Date
Oz Linden 9b2daf4b19 add credit in contributions.txt 2012-06-18 12:48:57 -04:00
Kadah_Coba 070c722631 storm-1843: remove unused ParcelMediaURLFilter code 2012-06-11 12:20:09 -07:00
Oz Linden 5b80b00dcd storm-1843: remove unused ParcelMediaURLFilter capability 2012-04-16 22:01:27 -04:00
Oz Linden b187aeb8f1 Added tag 3.3.0-release for changeset 5e8d2662f38a 2012-03-21 12:14:36 -04:00
Oz Linden 77df887b65 Added tag viewer-release-candidate for changeset 5e8d2662f38a 2012-03-13 16:04:27 -04:00
Oz Linden 9ce394a484 Added tag DRTVWR-119, 3.3.0-beta1 for changeset d5f263687f43 2012-03-11 08:06:37 -04:00
Oz Linden 9f704b61ad merge beta tags 2012-03-11 08:06:22 -04:00
Oz Linden 3210b0922e pull back release tags for 3.2.8 2012-03-07 12:11:11 -05:00
Oz Linden 739532ee4f Added tag DRTVWR-113_3.2.8-release, 3.2.8-release for changeset 51b2fd52e36a 2012-03-01 12:41:27 -08:00
Oz Linden 80f2836a42 merge changes for vmrg-231 2012-02-29 13:02:07 -08:00
Oz Linden 373ee3dd23 merge changes for sh-2963 2012-02-29 11:11:10 -08:00
Oz Linden 1bbdf941a2 merge tags from beta branch 2012-02-29 11:10:26 -08:00
Richard Linden 1effb12705 EXP-1888 FIX Update text for emtpy Received Items folder in the Viewer 2012-02-28 12:50:10 -08:00
Debi King (Dessie) 14687b1c37 Added tag DRTVWR-118_3.2.9-beta2, 3.2.9-beta2 for changeset a01ef9bed286 2012-02-22 14:04:12 -05:00
Debi King (Dessie) 167a7dcd2f merge 2012-02-22 14:02:15 -05:00
Oz Linden 5f85e7a824 merge changes for SH-2973 2012-02-21 09:55:30 -05:00
Oz Linden 1074219c8a merge back beta tags 2012-02-21 09:53:39 -05:00
Dave Parks 52782548c8 SH-2973 Rearrange shutdown operations to prevent crash on exit on OSX 2012-02-14 17:09:42 -06:00
Dave Parks ca179444a1 SH-2973 Potential fix for crash in ~LLVOAvatarSelf 2012-02-13 19:13:22 -06:00
Leslie Linden 03c002641e EXP-1888 FIX -- Update text for emtpy Received Items folder in the Viewer 2012-02-13 15:43:47 -08:00
Leslie Linden bb5797efd9 Resized the Merchant Outbox spinner to its native size 2012-02-10 12:41:20 -08:00
Dave Parks 077130eaee SH-2963 Fix for highlight transparent not highlighting 100% transparent objects. 2012-02-10 14:28:16 -06:00
Leslie Linden 788343db01 * Added timers to track the http transactions, visible through the same
"InventoryOutboxLogging" debug flag.
2012-02-10 10:56:55 -08:00
Debi King (Dessie) e5f81fdcc9 Added tag DRTVWR-117_3.2.9-beta1, 3.2.9-beta1 for changeset e9c82fca5ae6 2012-02-09 15:17:34 -05:00
Leslie Linden 94b8cd3fa6 Enabled the 'Merchant Outbox' menu item and context menu 2012-02-09 09:27:18 -08:00
Oz Linden ab5ec520a3 pull back merge from viewer-pre-beta 2012-02-09 11:44:41 -05:00
Oz Linden 6179b8bd92 pull back tags from viewer-beta 2012-02-09 11:43:15 -05:00
Debi King (Dessie) 041f1c1b03 merge 2012-02-06 14:52:11 -05:00
Debi King (Dessie) d0da897b24 tag merge back from viewer-beta 2012-02-06 14:48:09 -05:00
Debi King (Dessie) 836e5e56ee Added tag DRTVWR-115_3.2.8-beta2, 3.2.8-beta2 for changeset 987425b1acf4 2012-02-06 14:43:32 -05:00
Oz Linden 289d756ea8 increment viewer version to 3.3.0 2012-02-06 10:01:09 -05:00
Oz Linden 54bc900c95 Added tag 3.2.9-start for changeset 37dd400ad721 2012-02-06 10:00:15 -05:00
Oz Linden 099ce3cbde merge changes for vmrg-222 2012-02-03 18:35:46 -05:00
Richard Linden a89fbc1d33 EXP-1868 FIX Remove Merchant Outbox from Me menu
removed merchant outbox context menu
reviewed by Leslie
2012-02-03 11:14:54 -08:00
Debi King (Dessie) a3a69b1eb1 Added tag DRTVWR-114_3.2.8-beta1, 3.2.8-beta1 for changeset 16f8e2915f3f 2012-02-03 14:01:03 -05:00
Richard Linden 028d9b3b34 EXP-1868 FIX Remove Merchant Outbox from Me menu
reviewed by Leslie
2012-02-03 10:45:14 -08:00
Vadim ProductEngine 36aba26615 EXP-1843 WIP Added an option to output avatar rez timing.
Use the new "Avatar Rez" debugging tag to see the output.
2012-02-03 11:10:13 +02:00
Brad Payne (Vir Linden) 34408bed26 merge 2012-02-01 15:43:11 -05:00
Debi King (Dessie) a39937f930 merge 2012-01-30 22:27:01 -05:00
Oz Linden 0e609cc95b increment viewer version to 3.2.9 2012-01-30 16:45:50 -05:00
Oz Linden bd4c629e38 Added tag 3.2.8-start for changeset 89980333c99d 2012-01-30 16:44:58 -05:00
Oz Linden 1ed8faee81 merge changes for vmrg-219 2012-01-30 15:48:44 -05:00
Xiaohong Bao 717a6f3306 Introduce two new parameters "CurlUseMultipleThreads" and "CurlRequestTimeOut" for QA to test Curl. 2012-01-25 18:27:40 -07:00
Xiaohong Bao cc3f90a888 Automated merge with https://bitbucket.org/VirLinden/vir-project-3 2012-01-25 16:30:02 -07:00
Xiaohong Bao 1316f33130 fix for SH-2904: textures remain stuck in HTP state 2012-01-25 16:01:56 -07:00
Dave Parks 63398cd531 SH-2791 Use request class constructor/destructor for keeping track of concurrent requests instead of unreliable increments/decrements sprinkled around the code. 2012-01-24 17:37:20 -06:00
Brad Payne (Vir Linden) 9bbaf3ab14 merge 2012-01-30 10:23:06 -05:00
Oz Linden 4ef9277761 merge changes for vmrg-218 2012-01-24 16:22:23 -05:00
Oz Linden b2f77bee7e merge changes for vmrg-217 2012-01-24 16:21:34 -05:00
Brad Payne (Vir Linden) a2544b18e8 merge 2012-01-24 14:51:47 -05:00