Commit Graph

563 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
Liru Færs
842d1b8d93 Add LLIMProcessing and support for new message caps! And UserInfo cap!
Also delayed sound support!
Fixed memory leaks and pass by values that LL likes to introduce.
Extended LLCoroResponder to have a responder for Raw strings, also clean it
Adds friend request message logging.
2020-02-25 03:04:58 -05:00
Liru Færs
e65b513562 Syncy stuffs 2020-02-11 13:04:05 -05: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
d32e478456 Clean up some string character literals 2020-01-06 02:16:44 -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
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
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
Lirusaito
2580ca7afd Fix paused frame overflow, thanks Rye! 2019-07-31 14:22:27 -04:00
Lirusaito
6a60fa3458 Merge branch 'animesh' of git://github.com/Shyotl/SingularityViewer into animesh 2019-07-10 03:43:44 -04:00
Shyotl
1234cf42e9 msg_blk_data_map_t mMemberBlocks must be ordered. Todo: convert to vector, as insertion order should be good enough with minor changes. 2019-07-10 01:37:00 -05:00
Shyotl
f16bde1ac8 No exceptions on unrecognized messages. 2019-07-10 01:06:21 -05:00
Shyotl
49b027f2a0 Rework llindexedvector to be a bit more debugable. 2019-07-10 01:05:42 -05:00
Shyotl
e32b13e226 Disable old hack that was breaking ssl connections, as LL now uses TLS1.1. 2019-07-09 21:39:21 -05:00
Lirusaito
b8cfb5c8be Unbreak my Goat, Fix UDP again 2019-07-04 11:02:40 -04: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
Lirusaito
ce42937e3f Goats are as delicate as the UDP pipeline 2019-07-01 20:29:08 -04:00
Lirusaito
aec4278292 Unbreak the goat! 2019-06-30 18:25:27 -04:00
Lirusaito
005ec30d7b Max estate managers is 15 now 2019-04-25 17:07:51 -04:00
Shyotl
3724cf0e68 Fixed some more header issues. 2019-04-11 03:12:48 -05:00
Lirusaito
a1d06e682e Switch to using typedef'd uuid types everywhere and auto for iterators
Oh, and some related opts.
2019-04-04 22:20:21 -04:00
Lirusaito
059fc7c4fa [EEP] LLMessage Changes 2019-03-25 00:44:00 -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
Shyotl
2d8fbb89c9 Intermiediary commit. 2019-03-16 17:51:00 -05:00
Lirusaito
b005b2a53a Rule #1: Do Not Lie!
Don't lie about status codes to responders anymore
This may cause some bugs, but I highly doubt it, anyway, if it does,
that's what responders are for, to specialize handling in these situations.
2019-03-07 16:26:24 -05: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
eb747e2304 Fix CURL failures 2018-08-10 18:05:00 -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
Drake Arconis
54fe7a8606 Well this...compiles 2018-04-26 15:54:24 -04:00
Shyotl
ce1b58dd13 Merge branch 'master' of git@github.com:Shyotl/SingularityViewer.git 2018-02-08 01:56:43 -06:00
Shyotl
05b8e08ee8 Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer.git 2018-02-08 01:35:31 -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
Shyotl
77ebb91d37 Resolve linker errors encountered on linux builds. 2017-11-17 23:21:03 -06:00
Shyotl
733fca3d49 Http asset fetching. 2017-06-20 19:50:22 -05:00
Shyotl
f4a713a500 Merge. 2017-03-14 04:02:53 -05:00
Lirusaito
f33429f1bb Buncha pointless sync and cleanup 2016-05-27 12:17:30 -04:00
Lirusaito
3bedb5f6d4 Sync llappearancemgr.cpp with upstream and rllva
Remove old unused stuff
Comment out some questionable stuff that's not upstream
Rearrange a thing to match upstream

Hopefully this fixes the baking bug?
2016-05-26 10:13:42 -04:00
Shyotl
691a5395ca llmessage merge and further LLUnit usage. 2016-04-07 20:17:30 -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
58e08a972d Get windows 64-bit building 2016-01-16 18:50:38 -05:00
Drake Arconis
69d67e57a6 Fix a VS2015 warning 2016-01-16 17:03:15 -05:00
Drake Arconis
2f2e1fbe8f Major breaking changes 2016-01-16 08:05:47 -05:00
Inusaito Sayori
46db0d8d50 Sync llviewermedia with alchemy. 2015-08-12 20:09:21 -04:00
Shyotl
dedd75dc4f Implement all aisv3 HTTP requests. Added PATCH and COPY methods. 2015-07-23 01:02:02 -05:00
Shyotl
9f10d9510d Initial AISv3 merge. New HTTP messages not plugged in yet. 2015-06-25 20:16:30 -05:00