Commit Graph

58014 Commits (9edad026f4494de1a6f02ecc3f477faa27a361ef)

Author SHA1 Message Date
Ansariel f4b49de475 Add elapsed time to Discord rich presence 2019-09-10 21:28:01 +02:00
Ansariel bd573261a0 Merge Firestorm LGPL 2019-09-10 20:10:43 +02:00
Ansariel 67df0259c5 Update German translation 2019-09-10 20:09:47 +02:00
Ansariel 438bb8c113 Merge viewer-neko 2019-09-10 20:03:09 +02:00
andreykproductengine 37eb735ba7 Merged in lindenlab/viewer-release 2019-09-10 20:30:25 +03:00
andreykproductengine 98b28e5881 SL-11910 [Win] Horizontal scroll 2019-09-10 19:49:15 +03:00
AndreyL ProductEngine b31a93baa8 Upstream merge from lindenlab/viewer-neko 2019-09-10 23:21:56 +03:00
AndreyL ProductEngine 83651c49dd Downstream merge from lindenlab/viewer-manul 2019-09-10 23:19:36 +03:00
Ansariel 18b73cf819 Merge LL viewer-release 6.3.1 2019-09-10 18:37:07 +02:00
Ansariel 0ddac19941 Merge Firestorm LGPL 2019-09-10 18:35:34 +02:00
Ansariel 614ca33030 Localizable Discord app name 2019-09-10 18:21:07 +02:00
Ansariel 421b881196 Fix Discord preproc definition 2019-09-10 18:19:37 +02:00
Ansariel 242fbdbbbe Fix CMake warning 2019-09-10 17:42:56 +02:00
Nat Goodspeed e241670694 increment viewer version to 6.3.2 2019-09-10 11:40:40 -04:00
Nat Goodspeed 4798dea988 Added tag 6.3.1-release for changeset ece699718f16 2019-09-10 11:40:39 -04:00
Ansariel 6c0f441ecb Merge 2019-09-10 17:37:33 +02:00
Ansariel ffae98e43a Update German translation + minor fixes in EN + removal of unused duplicate strings 2019-09-10 17:36:07 +02:00
Nicky 767f382a70 Corrected library names. 2019-09-10 17:13:22 +02:00
Nicky 2b962ab541 Clean up conflicting use of tabs vs spaces. 2019-09-10 16:57:26 +02:00
Nicky fd53956f30 Completly build without Discord if no API Key is given. 2019-09-10 16:55:38 +02:00
maxim_productengine 05fcbb5df9 SL-11909 FIXED Crash in Second Life Release!LLIMProcessing::requestOfflineMessagesCoro 2019-09-10 17:55:27 +03:00
Nicky 197e1ab3c6 Make sure string pointer keeps valid as long as needed. 2019-09-10 16:55:14 +02:00
Nicky 16693bf2c7 Change BOOL to bool 2019-09-10 16:54:34 +02:00
Liny 72ed55ca02 Fix cmake syntax differences between it and c 2019-09-10 04:44:04 -07:00
Liny e1718780a5 Fix XML typo 2019-09-10 04:36:07 -07:00
Liny debb1b5a1b Fix mac and linux builds by un-swapping their downloads.
I guess im in need of sleep.
2019-09-10 04:32:50 -07:00
Liny 1c8be4e323 Discord rich presence support 2019-09-10 04:24:02 -07:00
Liny 768cced8fb Line ending fix 2019-09-09 18:05:23 -07:00
Ansariel 4180760795 Test commit 2019-09-07 02:18:55 +02:00
PanteraPolnocy 92baa75d4e Updated Polish translation - minor
(also, testing push on new host)
2019-09-07 02:06:08 +02:00
Ansariel c62ef0981b Merge viewer-neko 2019-09-06 19:58:23 +02:00
Ansariel c7ee04f77a Merge Firestorm Bear 2019-09-06 18:27:59 +02:00
Ansariel a488a39f45 Sync this indentation screw-up separately 2019-09-06 18:27:06 +02:00
Ansariel 97fa23de7d Merge viewer-bear 2019-09-06 18:12:52 +02:00
Ansariel a1acc71f42 Merge Firestorm Bear 2019-09-06 17:55:28 +02:00
Ansariel e33586015d Merge Firestorm LGPL 2019-09-06 17:53:56 +02:00
Ansariel b6a50623f8 Merge Firestorm Lynx 2019-09-06 17:52:37 +02:00
Oz Linden b74f698caa handle slvoice executable separately from the vivox libraries, and update mac slvoice package 2019-09-06 11:51:36 -04:00
Ansariel bf0f1b9d12 Merge viewer-lynx 2019-09-06 17:49:59 +02:00
Ansariel eb7c4ab0a6 Merge Firestorm LGPL 2019-09-06 17:48:12 +02:00
Ansariel 9a8dcbf613 Merge Firestorm LGPL 2019-09-06 17:46:08 +02:00
AndreyL ProductEngine 469cdfd23e Upstream merge from viewer-neko 2019-09-06 16:13:38 +03:00
andreykproductengine 324f3e6fd0 SL-11315 Build fix (removed not yet existing state) 2019-09-06 12:05:59 +03:00
maxim_productengine c72547adc3 SL-11883 FIXED Crash: SecondLifeViewer!update_statistics 2019-09-06 11:47:28 +03:00
AndreyL ProductEngine 7411bff293 Mac buildfix 2019-09-06 01:41:11 +03:00
AndreyL ProductEngine d07ff62c74 SL-11848 Fixed login crash (Face with no texture index references indexed texture draw info) 2019-09-05 23:46:59 +03:00
Ansariel 5b0865d7a7 Update German translation 2019-09-11 22:10:45 +02:00
Ansariel a6666322ed Simplify including of Discord rich presence files 2019-09-11 22:04:02 +02:00
AndreyL ProductEngine 8a9a929599 SL-11848 Fixed login crash (Face with no texture index references indexed texture draw info) 2019-09-05 23:46:59 +03:00
AndreyL ProductEngine c3bd256f33 Upstream merge from viewer-neko 2019-09-05 22:00:41 +03:00