Commit Graph

58014 Commits (9edad026f4494de1a6f02ecc3f477faa27a361ef)

Author SHA1 Message Date
andreykproductengine cef34f5861 SL-12152 Fix for missing Hair Preview in texture uploading 2019-10-18 20:39:27 +03:00
Ansariel 5bd5d08af7 Merge 2019-10-18 18:16:50 +02:00
Ansariel 24231e7a71 Merge voice-56 2019-10-18 18:13:32 +02:00
ziree 0bbccb1cda Make FS AO animation transitions smoother by avoiding double starts and stops of motions 2019-10-18 01:55:58 +02:00
Ansariel 3789a192dc Merge viewer-lynx 2019-10-16 22:48:57 +02:00
andreykproductengine 94d4364084 SL-12103 More reliable memory detection 2019-10-16 22:36:10 +03:00
AndreyL ProductEngine 410d25eed5 Downstream merge from lindenlab/viewer-serval 2019-10-16 18:51:38 +03:00
Oz Linden 80236bb657 merge 6.3.2-release 2019-10-16 09:07:50 -04:00
andreykproductengine 6ea01a8c4a Merge fix 2019-10-16 14:04:53 +03:00
AndreyL ProductEngine 718bd55f68 Downstream merge from lindenlab/viewer-serval 2019-10-16 04:20:44 +03:00
Ansariel a94d482dd4 Merge viewer-neko 2019-10-16 00:41:04 +02:00
AndreyL ProductEngine 0ff935ca3c Brought back the changes from @andreyk for improved mouse scroll wheel performance (previously 8e228364f324) 2019-10-16 01:37:15 +03:00
AndreyL ProductEngine 910fea5470 Backed out changeset: cf8cdb77790b 2019-10-16 02:04:29 +03:00
AndreyL ProductEngine f452f0c0a0 Buildfix 2019-10-16 01:26:14 +03:00
Ansariel b1ae8def22 Merge Firestorm LGPL 2019-10-15 23:34:02 +02:00
Ansariel 0314b6a8ec Merge LL viewer-release 6.3.2 2019-10-15 23:23:38 +02:00
Ansariel 3679d4aa0f Merge Firestorm LGPL 2019-10-15 23:21:46 +02:00
AndreyL ProductEngine d1411e43a9 Downstream merge from lindenlab/viewer-serval 2019-10-15 23:19:26 +03:00
AndreyL ProductEngine 99718ed7ee Downstream merge from lindenlab/viewer-manul 2019-10-15 23:18:49 +03:00
AndreyL ProductEngine f8f960b65a Downstream merge from lindenlab/viewer-serval 2019-10-15 23:09:35 +03:00
AndreyL ProductEngine bc63064735 Downstream merge from lindenlab/viewer-manul 2019-10-15 23:08:02 +03:00
andreykproductengine af5c556270 Merge from viewer-release 2019-10-15 21:28:37 +03:00
AndreyL ProductEngine d7f73cfc5b Backed out changeset: eb99f42d0fdc 2019-10-15 21:15:32 +03:00
AndreyL ProductEngine 499ef63589 Upstream merge from lindenlab/viewer-neko 2019-10-15 20:40:57 +03:00
AndreyL ProductEngine 1f5f9d2e59 Downstream merge from lindenlab/viewer-serval 2019-10-15 20:39:40 +03:00
AndreyL ProductEngine 7a90e71adf Downstream merge from lindenlab/viewer-manul 2019-10-15 20:38:08 +03:00
AndreyL ProductEngine 885c56a660 Downstream merge from lindenlab/viewer-bear 2019-10-15 20:36:12 +03:00
AndreyL ProductEngine 35d3901b99 Merged in lindenlab/viewer-release 2019-10-15 20:34:44 +03:00
Nat Goodspeed 33821bd599 increment viewer version to 6.3.3 2019-10-15 13:27:53 -04:00
Nat Goodspeed b26bdc8987 Added tag 6.3.2-release for changeset 07f5d5bc9fae 2019-10-15 13:27:53 -04:00
andreykproductengine 48e282947f SL-11986 Mesh Uploader does not report Upload cost on fee-failure 2019-10-15 17:25:26 +03:00
maxim_productengine 9666a96e68 SL-12115 FIXED The camera flies away when sitting on a new object with edit mode enabled 2019-10-15 15:56:40 +03:00
andreykproductengine bd42fd13b0 SL-11719 Fixed init of conversation log 2019-10-14 20:49:16 +03:00
maxim_productengine 1b19a88e84 SL-12067 Don't allow to send L$ gifts to Null UUID 2019-10-14 16:13:07 +03:00
Nicky 391a2c4598 Linux/Mac: FMOD Studio 2.00.05 2019-10-13 22:36:07 +02:00
Nicky 84d7c832cb Make indices 32 bit to avoid overflows. 2019-10-13 18:50:32 +02:00
Ansariel 191b935274 Update FMOD Studio to 2.00.05 on Windows 2019-10-13 14:47:03 +02:00
Nicky f3855085f5 FIRE-23370 / Linux; cache optimize volume faces again without destroying the triangle mesh. 2019-10-12 06:59:39 +02:00
maxim_productengine 5ce0d6268b SL-12093 FIXED [ordered shutdown] conversation.log erased at log in when all logs are set to be saved 2019-10-10 16:35:11 +03:00
maxim_productengine f2d92b05b8 SL-12087 FIXED Values for physical preset (wood, stone, metal, etc.) in build tool don't update unless the edited object is reselected. 2019-10-10 10:58:14 +03:00
Ansariel d59cd13de1 Merge viewer-bear 2019-10-09 22:43:10 +02:00
Ansariel 555115b818 Merge Firestorm LGPL 2019-10-09 22:40:57 +02:00
Nicky 478630d338 Pull out local var to make sure it's lifetime (and thus the internal c_str() pointer) is longer than the if block. 2019-10-09 22:37:13 +02:00
Nicky 1d94fc7ce6 Change function signature of getAnonym to return std::string rather than reference and do not return "nobody" in case RLVa is disabled. 2019-10-09 22:32:19 +02:00
Ansariel e0004e744e Merge Firestorm LGPL 2019-10-09 22:09:22 +02:00
Ansariel 146d527104 Merge viewer-neko 2019-10-09 22:05:52 +02:00
ziree 22c24e188a Fix compiler warning for GCC 9 on Linux. Patch by Kitty Barnett 2019-10-09 21:06:41 +02:00
AndreyL ProductEngine b964850141 Downstream merge from lindenlab/viewer-serval 2019-10-09 19:34:55 +03:00
AndreyL ProductEngine 12baf75878 Downstream merge from lindenlab/viewer-manul 2019-10-09 19:32:19 +03:00
AndreyL ProductEngine fe490d52b4 Merged in lindenlab/viewer-xcode11 2019-10-09 19:28:30 +03:00