4 Commits

Author	SHA1	Message	Date
Liru Færs	b08b597397	Merge branch 'master' of git://github.com/Shyotl/SingularityViewer ... # Conflicts: # indra/llcommon/llsd.cpp # indra/llcommon/llsdserialize.cpp # indra/newview/llspeakers.cpp # indra/newview/llviewermessage.cpp	2020-02-25 06:51:41 -05:00
Shyotl	5c2c2a8c01	Minor cleanup. Octree vfunc reduction. Range-based for loops with map/array llsd types.	2020-02-25 01:50:50 -06:00
Liru Færs	deafc6814d	Fix crashes from badly formed json responses (LL's fault) ... Adds LlsdFromJsonString, an exception-free wrapper for parsing json strings LLSD objects that failed to parse through this will be the type Undefined. Fixes crashes 36, 1G, 33, 21, and 3A.	2020-01-21 03:18:43 -05:00
Lirusaito	fc488959ea	Switch out jsoncpp for nlohmann json ... Add llsdjson.* too!	2019-03-07 03:38:27 -05:00