Commit Graph

423 Commits

Author SHA1 Message Date
Liru Færs
265336463d Add FMOD Logo to login screen to comply with licensing
Adds code to hide the new UI when compiled without FMOD Studio
2020-01-11 04:32:42 -05:00
Router Gray
c8290b913e [CMake] Change remaining WORD_SIZE references to ADDDRESS_SIZE. 2019-12-27 06:16:59 -06:00
Liru Færs
99346d6486 This should've been committed in f3609b06d7 2019-12-21 04:58:57 -05:00
Liru Færs
4798d1e3b3 Finish migration from summary.json to build_data.json 2019-12-18 00:00:22 -05:00
Liru Færs
10140d143c Wooops, branding ID separation is necessary, revert that change
Set up VIEWER_BINARY_NAME based on VIEWER_BRANDING_ID, make spaces dashes.
Fix VIEWER_EXE_GLOBS being wrong on Linux, thanks Router!
2019-12-17 23:49:37 -05:00
Liru Færs
f3609b06d7 Further CI/CD & building sync with alchemy
Reorder Variables.cmake for mergeability
Renames CMake Variables:
FMODSTUDIO->USE_FMODSTUDIO, NVAPI->USE_NVAPI,
VIEWER_CHANNEL_BASE->VIEWER_CHANNEL_TYPE
VIEWER_BRANDING_ID->VIEWER_BINARY_NAME,
VIEWER_PRODUCT_NAME->VIEWER_CHANNEL_BASE

Remove unused variables:
VIEWER_PACKAGE_ID, VIEWER_EXE_STRING, VIEWER_SHORTCUT_STRING, VERSION_BUILD

PACKAGE now defaults to on, USE_FMODSTUDIO now defaults to off

Use list append instead of set in some more places

Adds support for Project channels.
2019-12-17 19:31:08 -05:00
Liru Færs
573934e505 Disable Breakpad symbol generation, not needed for crashpad 2019-11-07 06:30:37 -05:00
Liru Færs
afbafbe689 Merge branch 'master' of https://github.com/RouterGray/SingularityViewer
# Conflicts:
#	indra/newview/CMakeLists.txt
2019-10-22 01:03:45 -04:00
Router Gray
e3d69b4d8e [Audio] Make Fmod cooperate with the new PCH shiny. Also fixes OpenAL in Windows. 2019-10-21 20:23:55 -05:00
Liru Færs
432bf03f0a Port Crashpad support from alchemy, with some small tweaks
Moved initCrashReporting into LLAppViewer, everything we use there is
crossplatform enough that duplicating code is silly

Removes unused gCrashSettings
Adds MBFatalError, that's right, Crash Loop is now translatable!
Adds consent notification prompt to first login... enjoy that, everyone.
2019-10-21 16:25:29 -04:00
Liru Færs
8a2407ecbb fmt, just not for linux 2019-10-20 05:54:05 -04:00
Liru Færs
05146faacf Merge branch 'master' of git://github.com/Shyotl/SingularityViewer 2019-10-20 01:49:28 -04:00
Shyotl
a36e128e57 Re-enabling NSIS invocation (???) 2019-10-19 18:41:18 -05:00
Liru Færs
0f28a1bd86 These are things, I'm sleepy 2019-10-19 07:24:30 -04:00
Liru Færs
9c2d062886 Finish up ninja support, thanks Rye! 2019-10-17 23:04:21 -04:00
Liru Færs
7b3c3b9fab Burst Commit for building with ninja and more, thanks Alchemy!
GeneratePrecompiledHeader - Cinder and Rye
Ninja Support - Rye
Fetch Content instead of prebuilds - Rye
Visual Studio Native CMake Support - Rye
2019-10-17 21:15:30 -04:00
Liru Færs
65ee3a5345 Move duplicated logic out of NameBox and into new base class LLNameUI
Also clean up includes.
2019-10-09 01:34:00 -04:00
Rye Mutt
2f4d254bc6 Fix calling cmake -E to use proper cmake var 2019-10-07 12:03:15 -04:00
Rye Mutt
a46f1145f5 Properly disable WER reporting 2019-10-07 11:56:31 -04:00
Rye Mutt
8561af1f84 Add abseil hashmaps and use in texture list, also fix bugs in texture list insertion 2019-09-28 19:03:49 -04:00
bittenbythedark
a987bcac6f Fix MP4 Playback on windows, alchesync 2019-08-05 21:08:13 -04:00
Router Gray
ed4e91ee7f [Linux] Cmake fix to not do manifest copy twice when packaging. 2019-08-01 08:48:57 -05:00
Router Gray
dc77a053ea [Alchemy sync] Switch from shipping vc_redist to shipping the dll's from the build host. 2019-07-29 23:04:26 -05:00
Lirusaito
d0a6772245 Merge in EAM from viewer-release
Remove the derpy stuff lindens like to do
Wide strings aren't normal strings

Make it all a bit better~
Redid the Duration floater because it was kinda icky,
gave it more flexibility~<3
Display parcel ban and access durations as dates instead of text, sortable!
Reworked the rather icky lookin' Access panel control ordering
Enabled lowering parcel ban time without needing to find and remove first
2019-07-20 18:27:47 -04:00
Lirusaito
3a678f5a9b Merge branch 'animesh' of git://github.com/Shyotl/SingularityViewer into animesh 2019-07-04 12:39:47 -04:00
Shyotl
d9392d5c39 fix cmake without vc redist. remove double to float warning. 2019-07-04 09:30:59 -05:00
Lirusaito
658be9bd58 Fully combine voice with tos stuffs
Removes separate voice license code
Cleans up tos code
2019-07-02 14:00:46 -04:00
Router Gray
535a01ea30 SLVoice update Windows and Mac 2019-05-05 20:14:53 -04:00
Lirusaito
d194dfbc09 Sync with alchemyng for VCRedist update 2019-04-19 23:25:47 -04:00
Lirusaito
f670c774d3 Oh hey, we can do this part of VLC merge right now too! 2019-04-17 18:28:22 -04:00
Lirusaito
7c41dc2e7e It's a syncing ship
Ha... get it?
I'm so lonely...
2019-04-17 18:09:39 -04:00
Lirusaito
3ad4770b44 [Support] Show a concise indicator in chat for viewer channel/branch 2019-04-09 04:40:42 -04:00
Lirusaito
c5329968f7 Merge branch 'animesh' of git://github.com/Shyotl/SingularityViewer
# Conflicts:
#	indra/llcommon/llstring.h
#	indra/newview/llviewermenu.cpp
#	indra/newview/llviewerregion.cpp
2019-03-18 17:30:34 -04:00
Shyotl
b81373366b Animesh test changes. Also stop screwing with my commit messages, github. 2019-03-17 02:35:07 -05:00
Lirusaito
b71ee44505 Merge branch 'master' of git://github.com/Shyotl/SingularityViewer into ManagedMarketplace 2019-03-17 00:22:55 -04:00
Shyotl
3a78568a6f Intermediary commit #2. 2019-03-16 21:35:33 -05:00
Shyotl
2d8fbb89c9 Intermiediary commit. 2019-03-16 17:51:00 -05:00
Shyotl
5d75b3b223 Prep for animesh. 2019-03-09 01:51:50 -06:00
Lirusaito
fc488959ea Switch out jsoncpp for nlohmann json
Add llsdjson.* too!
2019-03-07 03:38:27 -05:00
Lirusaito
c985afa4f4 Remove more outbox parts, I think these were never even used 2019-03-04 17:34:14 -05:00
Lirusaito
1d0214ed54 Remove the Outbox
Goodbye, old friend.
2019-03-03 16:39:16 -05:00
Lirusaito
fb39f2d511 Merge branch 'master' into ManagedMarketplace
# Conflicts:
#	indra/newview/llinventorybridge.cpp
#	indra/newview/lltooldraganddrop.h
2019-02-28 23:58:08 -05:00
Lirusaito
f4a22ef857 Patch AIXML to work now for import
Not bothering with export at the moment

AIXML"Stream" wasn't even using its stream in its constructor...
Someone clearly hadn't been using ACTUAL C++ for longer than C++'s existence like was claimed
...but then, that's literally impossible, so what could we expect...
And dear lord please stop throwing in constructors...
There are so many better ways to do this...
This use of throwing is why people dislike goto
It's hard to follow flow control that would be better done another way...
One day I'll fix it so it is, until then meh.

Rips out AIFile, since nothing is actually using it anymore and GPL code needs purged.
2019-02-25 12:46:41 -05:00
Lirusaito
a62d433262 Favorites on the login screen
Adds some guts for the favorites bar, I'll get to that eventually
2019-02-05 05:17:08 -05:00
Inusaito Sayori
167d336274 Up to compile phase
at 20fd3e98b4
2019-01-25 19:32:15 -05:00
Lirusaito
7112e163e6 Update our url stuffs!
Adds support for JIRA link labels from Alchemy. (Made less of a mess by me)
Adds support for x-grid-info, the future of x-grid-info-location from Alchemy.
Updates uriparser latest from Alchemy.
Updates llstring to be more in line with upstream Alchemy.
Fixes our LLURI Implementation
Updates LLURLAction to modern C++ stuffies~
Adds Email protocol support from alchemy
Sync LLSLURL with Alchemy, adding x-grid-info support.
Also keep NoProtocol Support because yaaassss~
(also we won't suffer from MAINT-5019 because we're not dumb.)
2019-01-20 09:13:05 -05:00
Shyotl
2257e8ebe7 Add new required lib to newview. 2018-08-10 18:58:29 -05:00
Lirusaito
dd49033a08 Remove VSTool 2018-05-02 19:20:38 -04:00
Shyotl
ce1b58dd13 Merge branch 'master' of git@github.com:Shyotl/SingularityViewer.git 2018-02-08 01:56:43 -06:00
Shyotl
2dc46964b4 Simple update check mechanism, and tons of notification tweaking to make the notifications look less crap. 2018-02-08 01:26:09 -06:00