Commit Graph

556 Commits

Author SHA1 Message Date
Lirusaito
cab39e31a1 Don't llformat if empty fmt string. 2019-03-07 12:47:29 -05:00
Lirusaito
fc488959ea Switch out jsoncpp for nlohmann json
Add llsdjson.* too!
2019-03-07 03:38:27 -05:00
Lirusaito
4218011417 Merge branch 'master' into ManagedMarketplace 2019-03-03 12:56:03 -05:00
Lirusaito
58ba9e3617 Merge branch 'master' of git://github.com/Shyotl/SingularityViewer 2019-03-02 19:01:49 -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
8e18f2ab43 So sick of these EEP warnings in my log, add the asset types 2019-02-28 20:09:00 -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
d096c043f0 Attempt to fix disconnects by syncing to match upstream eventpoll
Upstream no longer repeats requests or force disconnects
upon 404 or internal library error, so we shouldn't either.
2019-02-24 09:06:32 -05:00
Lirusaito
2882cb728f Optimize llformat Even MORE, and clean up some code.
Thanks for the help, Aru!
2019-02-23 04:08:55 -05:00
Lirusaito
f9e3afaad2 Revert "Do llformat even better!"
This reverts commit 4f87e82a19.
string::data can't be nonconst until C++17, maybe one day.
2019-02-21 03:26:08 -05:00
Lirusaito
4f87e82a19 Do llformat even better! 2019-02-20 21:40:05 -05:00
Lirusaito
a2701faa2b Floss Finder: Igor
Igor is a dentist with more on his "plate" than he can handle
Watch as Igor tries to find all the floss in his patients' mouths
Starring Timmy the Tooth, and the Tooth Fairy; join all your favorite
oral hygiene friends in helping Igor solve his terrible tooth travesty!

(May contain traces of knockoff pokemon, talk to your dietician before consumption)
2019-02-20 21:22:24 -05:00
Lirusaito
174a2d36aa I found a leak, viewer-release found it too, let's use their fix
It's close enough to mine, although I disagree with using 0 for a pointer
instead of using nullptr, but alas, mergeability.

This damn leak happened at least every log line on Linux and Mac since
the dawn of time for the viewer... Disgusting.
Well, not every log line, but every log line mentioning a class, which is
most these days.
2019-02-19 11:55:42 -05:00
Lirusaito
049c1e16b0 Aurora-Sim is now WhiteCore
Minor Alchemy merge in removing llvlmanager,
indra_constants no longer has *_LAYER_CODE
2019-01-25 21:21:55 -05:00
Inusaito Sayori
fd4155f4b6 Merge vmm up to 3a62616f3dd8bd512fcdfd29ef033b2505b11213 2019-01-25 19:33:17 -05:00
Inusaito Sayori
f140b4f35c Giant VMM merge, still need to compile it and fix llfloatermarketplacelistings
Merge VMM up to change 187902d9c4afd2990acddeb964c928179a52d189

mAllowWear=>mAllowOpen (should probably just remove this altogether though
inventory_panels now accept the "show_root_folder", "allow_drop_on_root", "allow_open", and "use_marketplace_folders" attributes.

Other stuff in this commit:
LLPanelInjector~
Sync lltooldraganddrop to alchemy
Sync notifications up with alchemy
Reorganize notifications some, to better merge with upstream
Remove duplicate InventorySortOrder in settings map
There's a bit of a weird folderview merge mixed into here, I wouldn't trust it, but this thing is so god damn tangled I can't go back now~

Wouldn't have been possible without help from Shyotl and music by Amanda Palmer
2019-01-25 19:33: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
04ea11c61e Make gcc happier. 2018-11-20 02:49:57 -06:00
Shyotl
0b4d789afb Altered LLIndexedVector. There's zero point to having a lookup map into an array like this. Just iterating down the array is faster than the map lookup (which iterates down a linked list...). A hash map would be a different case entirely. 2018-10-12 02:07:45 -05:00
Shyotl
0d8dfb41bc Fix gcc 4.9 build errors. 2018-08-12 18:26:07 -05:00
Shyotl
38c6302f11 Attempt to make mesh loading a little less choppy. 2018-08-11 01:09:04 -05:00
Shyotl
5d2eb3e4cf Fixed hot spot in volume generation. 2018-08-10 23:07:13 -05:00
Shyotl
fe764ae97f Merge branch 'master' of https://github.com/Lirusaito/SingularityViewer.git 2018-08-07 21:46:07 -05:00
Shyotl
d11899561b Optimization pass. 2018-08-07 01:09:53 -05:00
Shyotl
07835ea832 Speed up texture cache init. (Was exceptionally slow with a debugger attached) 2018-04-29 01:58:04 -05:00
Drake Arconis
54fe7a8606 Well this...compiles 2018-04-26 15:54:24 -04:00
Shyotl
77ebb91d37 Resolve linker errors encountered on linux builds. 2017-11-17 23:21:03 -06:00
Shyotl
1230748ef5 Alchemy llcharacter and llcommon merge pass. 2017-03-31 02:08:03 -05:00
Shyotl
f4a713a500 Merge. 2017-03-14 04:02:53 -05:00
Shyotl
4a9ff22eeb I was critically damp once. It was okay. 2017-03-14 01:44:26 -05:00
Lirusaito
bc93f2792d Enable Crashing On Crashes 2016-06-14 04:05:38 -04:00
Lirusaito
6fcbe9d0de Increase DEFAULT_MAX_AGENT_GROUPS to 60
Also cleans up limits code stuffs and syncs indra_constants a bit.
2016-05-27 09:27:43 -04:00
Lirusaito
f14ad54c84 Linux compile fixes
Reapplies a fix from c3e593c20e

Updates libraries (FMOD Studio 1.08.01)

Don't use boost chrono, the standard has chrono!
2016-05-02 21:17:36 -04:00
Lirusaito
39b3f58e13 Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer
# Conflicts:
#	indra/newview/llvoavatar.cpp
Also Reverted reversion of removal of before() wrapper in llstl.h
2016-05-02 15:15:06 -04:00
Shyotl
df0b7a08cf New library dependency: libboost_chrono 2016-05-01 20:43:01 -05:00
Shyotl
55b5f60b68 V3 mesh, texture, and hover merge. 2016-04-26 13:36:39 -05:00
Shyotl
691a5395ca llmessage merge and further LLUnit usage. 2016-04-07 20:17:30 -05:00
Shyotl
0841479ccc llcommon merge. Added LLUnits. 2016-04-06 01:31:20 -05:00
Lirusaito
2653567d82 Sync with alchemy
Moves some constants out of llavatarconstants.h
8ebf8f4608bd: Change various const constants to constexpr
e07d5d43ba30: CID-143595
30b6935fc66d: CID-143595
acc96f9051cb: Fix a memory leak in viewer side baking initial wearable setup
Sync llmodel.*

Changesets assimilated:
f8f7706c2902: CID-143554 - fix out of bounds access
223eb65adce4: CID-143554 - Chase
2ceb49aaa133: CID-42838, CID-42930, CID-42933, CID-42938, CID-42940, CID-42945, CID-42948, CID-56111, CID-83907
d220005d9f23: Missing null check before deref
31dbb0f3b6ee: CID-42571 CID-42576 CID-42578
49caf082e65c: change unordered_map to flat_map
Doesn't cause as many problems as a hashmap when it comes to assumptions in the
LLUI system.
f93f5e881484: "update" linux cef
downgrade to fix javascript problems
cba818dd9269: Various null checks and etc.
1b4c6bc483bb: CID-42847, CID-42854, CID-42886, CID-42921, CID-42922, CID-42923, CID-42924, CID-42925,
CID-42927, CID-42928, CID-83871, CID-83876, CID-83878, CID-83880, CID-83900, CID-143573
0fe90cd9ec24: Various file size related things
a79f6f653dca: CID-42918 - Initialize member pointers in LLFloaterGodTools
0b70d600d978: Tweak LLFloaterBuyLand initializations
e8b173ffe813: CID-42854 - Additional fix to LLDrawInfo
b5d745cf3fde: Fix signage
4f2e2f384781: Initialize and cleanup various class member variables.
CID-42899, CID-42900, CID-42902, CID-42903, CID-42904, CID-42905, CID-42909, CID-42910,
CID-42911, CID-42912, CID-42913, CID-42967, CID-83853, CID-83898, CID-83890, CID-143584
9851a3e39b4c: Fix platform specific include directories
5c074e84f1be: Initialize and clenaup various more class member variables.
CID-42885, CID-42853, CID-42894, CID-42895, CID-42896, CID-83908, CID-143574, CID-143575,
CID-143576, CID-143576, CID-143578
ac262854ac92: Brace sub-object in initialization to make our intentions clear to clang
358da477d4c1: More double brace init
c3850119314a: Initialize various member pointers in panels
CID-83902, CID-83903, CID-83905, CID-83909, CID-83911, CID-83912, CID-143572
2016-03-30 21:06:47 -04:00
Lirusaito
e62261edb2 Sync with Alchemy, includes much awaited lib updates for Linux
Applies ALCH-420 - Replace all invisiprims with fully transparent texture and remove dead code paths
-ARC no longer takes invisis into consideration.

Syncs some script keywords updates.

Changes all "\n" in llfloaterabout.cpp to '\n' because screw.dat
2016-03-27 23:24:17 -04:00
Lirusaito
1449169b0a Restore Obsidian Win10 patch. 2016-03-06 18:50:26 -05:00
Lirusaito
d15ac7640c More C++11 cleanups, mostly from alchemy 2016-02-22 22:47:01 -05:00
Lirusaito
6e3f404a1c Rip out old workarounds, hacks and macros for newer C++ features not being supported back in the day.
Adds LL_COMPILE_TIME_MESSAGE support to Linux.

llfinite -> std::isfinite
llisnan -> std::isnan
vector_shrink_to_fit -> vector.shrink_to_fit
2016-02-14 17:37:10 -05:00
Drake Arconis
35c409f744 Fix linux64 config and cmake up 2016-01-20 07:22:34 -05:00
Drake Arconis
01bf430b1a Get linux64 somewhat working 2016-01-19 10:07:27 -08:00
Drake Arconis
949a9ab5dc Largely rework llfile* 2016-01-17 23:33:21 -05:00
Drake Arconis
947f08a4d4 Add windows 10 versioning code 2016-01-16 16:43:32 -05:00
Drake Arconis
13666ac62a Change out versioning code for less hacky versioning code 2016-01-16 10:06:07 -05:00
Drake Arconis
2f2e1fbe8f Major breaking changes 2016-01-16 08:05:47 -05:00
Siana Gearz
c358ffe8e2 Fix QueryPerformanceCounter eating more than half the CPU on AMD Win-x86_64
The issue was in fast timers, making the naming highly ironic.
Rewrote to use RDTSC intrinsic. Doubled the framerate.
2015-11-18 00:55:11 +01:00