Commit Graph

600 Commits

Author SHA1 Message Date
Shyotl
a29491658b Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer.git
# Conflicts:
#	indra/llmath/lloctree.h
#	indra/newview/llsurface.cpp
2020-03-15 00:53:20 -05:00
Shyotl
26976b715d Fixup minor use after free issues, and improper mutex usage in meshrepo. Also fixed some compiler warnings. 2020-03-15 00:46:57 -05:00
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
Inusaito Sayori
36b75b2398 A Massive Experience Tools (and Unstable Branch) Merge
[XP Tools] Initial merge Cherry Pick

Also modernize llfloaterauction internally, but leave the ui the same for now.
Breaks out script_question_mute() in llviewermessage.cpp to better sync with upstream
Adds support for UnknownScriptQuestion notification (translators need to translate this one~)
RLVa note: Rewrote RLVa permissions handling block just a bit.
Added 13 new capabilities from the XP Tools, I doubt all of them really exist.
Minor update to LLComboBox, decided against implementing LLIconsComboBox for now.
Modified LLExperienceLog::notify to lookup names and display them along with the slurls since our editors don't do that automatically.
Experience tweak: Changed a few notify's to notifytips so that we can click the links to experience profiles from chat instead of via hacked in buttons
Migrated LLFloaterCompileQueue to a proper Instance Tracker so we can call getKey
Modernized LLSD, gives us reverse iterators and the new debugging impl. We needed the reverse iterators.
Experience tweak: Added virtual destructors to responders.
Updated llhandle.h to allow calling getDerivedHandle in public.
Updated LLScrollContainer and LLScrollBar to be more modern.
Added LLFlatListView/flat_list_view from upstream - these don't seem work though?
Added some newer login/logout strings to strings.xml
Thanks for the default timeout policies, Aleric~
To avoid needing to scroll through tabs, about land tabs now are as big as they need to be to display their labels, same on groups
Group Members and Roles has been renamed to just Members because this allows the new Experiences tab enough room to display.
Thanks to Henri Beauchamp (Cool VL Viewer) for the setupList augmentation. (without it, I'd still be stuck)
Thanks to Shyotl for the helpsies~
Added the LSL constants, events, and functions that LL neglected to put in.
Added click callbacks and name lookups for profile linky texts~

Merge is up to 22b4cdc
Old TODO: Get the uis looking nice (profiles? Experiences... floater) - done
Old TODO: Make sure flatlistviews look okay... - Not using
Old TODO: Fix LLFloaterExperiencePicker, right now the panel does not show. - unsure
Old TODO: Remove the llfloaterabout.cpp change. - done

Merges llexperiencecache with upstream and unstable
Introduces LLCoroResponder, TODO: Make everything use this.
Updates Reporter floater to the latest, supports the new cap thingy

Also adds these commits/changes:
[XPTools] Double clicking experiences in namelists should open the profile
Add List.CopyNames support for Experiences
[XP Tools] Some UI work, I'll do more later
[XPTools] More UI Stuff, Later is now!
Allow getSLURL for experiences
WIP Experience list menu
Also make EXPERIENCE > OBJECT, because mainline started OBJECT already
[XPTools] Add Experience support to Name UI
[XPTools] Fix experience profile UI 9c3067e843265587e91c659200a8d783acf2d9b2
[XPTools] Fix experience location showing "last" and getting set to "last"
[XPTools] Move Experiences floater from view menu to world menu
[XPTools] Fix up more UI
[XPTools] Fix experiences panels
[XPTools] Hide pieces of the Experiences menu when they're not usable
[XPTools] More UI work, mostly to get the menus working
[XPTools] The events list is for events, not experiences, remove menu

# Conflicts:
#	indra/llcommon/llsd.cpp - merge with unstable branch
#	indra/llmessage/message_prehash.cpp
#	indra/llmessage/message_prehash.h
#	indra/llui/llscrollbar.cpp
#	indra/llui/llscrollcontainer.cpp
#	indra/llui/llurlentry.cpp
#	indra/llui/llurlregistry.cpp
#	indra/newview/app_settings/keywords.ini
#	indra/newview/app_settings/settings.xml
#	indra/newview/llappviewer.cpp
#	indra/newview/llappviewer.h
#	indra/newview/llassetuploadresponders.cpp
#	indra/newview/llcompilequeue.* - merge stable
#	indra/newview/llfloaterabout.cpp
#	indra/newview/llfloaterland.* - merge unstable
#	indra/newview/llfloaterproperties.cpp
#	indra/newview/llfloaterregioninfo.* - merge unstable
#	indra/newview/llmenucommands.cpp - merge unstable
#	indra/newview/llpreviewscript.cpp - merge unstable
#	indra/newview/llviewermessage.cpp - merge unstable
#	indra/newview/llviewerregion.cpp - merge unstable
#	indra/newview/skins/default/textures/textures.xml - merge unstable
#	indra/newview/skins/default/xui/en-us/strings.xml - merge unstable
2020-02-04 21:18:47 -05: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
Liru Færs
623a484ae3 Woops, gotta do a char array for that, also set errno to 0 2020-01-13 18:35:08 -05:00
Liru Færs
1726c27078 Fix for Linux file rename failures, thanks Taya and Router! 2020-01-12 13:23:02 -05:00
Liru Færs
828307ca96 Sync LLSDSerialize with alchemy, and merge fix for Crash K 2020-01-07 11:00:21 -05:00
Router Gray
c68e00730e [CMake Linux] Only include pthread and rt in target_link_libraries for ld.gold support (Alchemy sync)
Fixes CMake warnings on Linux
2019-12-25 09:08:48 -06:00
Router Gray
0496374328 [CMake] Use POSITION_INDEPENDENT_CODE property instead of manually setting -fPIC (Alchemy sync) 2019-12-25 09:08:40 -06:00
Liru Færs
067bd3cbd7 Sync with alchemy
Minor installer fix
Fix MSVC update breaking crashAndLoop
Move Variables to their corresponding places
Sync parts of deps/CMakeLists.txt
Update Abseil and fmt
2019-12-19 21:04:01 -05:00
Liru Færs
79e1830ba9 Fix compile 2019-11-24 02:54:23 -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
bd2c67e8ec Fix win32 warnings 2019-10-11 16:28:48 -04:00
Liru Færs
7c24e67c50 The UI portion of Bakes on Mesh... and the entire thing, sure, why not?
Also let's now select the proper tab when we input an ID or select a face
with an asset ID that we can find in a tab, but that never works for BOM
when applied.
2019-10-11 03:41:42 -04:00
Rye Mutt
a559a09217 Fix a ton of small bugs in 64bit memory value handling 2019-10-09 16:52:46 -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
Liru Færs
1b52b3e685 Merge branch 'animesh' of git://github.com/Shyotl/SingularityViewer into animesh
# Conflicts:
#	indra/llcommon/llindexedvector.h
2019-08-15 20:50:36 -04:00
Shyotl
4f72de8289 Make gcc happy with closer to standards compliant code.. 2019-08-10 01:16:37 -05:00
Lirusaito
9f84fe6d5a Make it Squeak 2019-07-31 19:43:33 -04:00
Lirusaito
2580ca7afd Fix paused frame overflow, thanks Rye! 2019-07-31 14:22:27 -04:00
Lirusaito
ac7e5cb742 Merge branch 'animesh' of git://github.com/Shyotl/SingularityViewer into animesh 2019-07-26 04:22:43 -04:00
Shyotl
2dbbec88f7 Fixed bug with LLStat median calculation. Clean up llstatbar a bit. 2019-07-25 23:43:04 -05:00
Shyotl
6dc9210a7e Const is good. Use it for viewer stats. 2019-07-25 22:30:44 -05:00
Router Gray
2f54cf26a9 Make gcc happy, silence 'changed meaning' warning. 2019-07-14 02:10:06 -04:00
Shyotl
49b027f2a0 Rework llindexedvector to be a bit more debugable. 2019-07-10 01:05:42 -05:00
Lirusaito
0cc146a170 Change LLInstanceTracker to use a boost unordered map
Also remove unused functions and an unused typedef with it
2019-04-28 09:01:38 -04:00
Lirusaito
56378772cc Add operator == for LLSD to llsdutil.h 2019-04-28 09:00:17 -04:00
Lirusaito
564410ac7e Fix some warnings and errors 2019-04-19 17:29:55 -04:00
Liru Færs
5e12a9d057 Scream!
Thanks for looking into this Router
2019-04-13 10:07:34 -04:00
Damian Zhaoying
4a59efadeb Fix spaming messages in assert and is_trivially_copyable on GCC 4 2019-04-13 01:02:38 -04:00
Lirusaito
c9eac98d53 Drake's trivially copyable optimop 2019-04-11 05:02:43 -04:00
Shyotl
1cfd782bdd Fix some compilation errors. 2019-04-11 02:54:21 -05:00
Lirusaito
ed88e55e04 Yay they updated llstring, who's ready for a full rebuild? 2019-04-10 12:38:35 -04:00
Lirusaito
a3bf40fd69 Boost unordered containers in places, like for uuid types! 2019-04-04 22:22:21 -04:00
Lirusaito
48003c8bc9 Remove pointless forward declaration 2019-04-04 21:52:57 -04:00
Lirusaito
9ccb015411 e5b81dd825 won't compile without this change 2019-03-24 22:51:35 -04:00
Lirusaito
e5b81dd825 [EEP] LLSDUtil changes 2019-03-24 21:04:51 -04:00
Lirusaito
fe33db1620 [EEP] LLSD Serialize Notation additions 2019-03-24 21:04:25 -04:00
Lirusaito
2e02f5ac2c [EEP] LLSD Changes 2019-03-24 20:59:50 -04:00
Lirusaito
198d567df2 [EEP] LLUnitType changes 2019-03-24 20:59:26 -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
2d8fbb89c9 Intermiediary commit. 2019-03-16 17:51:00 -05:00
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