UbitUmarov 7cf329c846 Merge branch 'master' into uglysky ... # Conflicts: # OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs # bin/OpenMetaverse.Rendering.Meshmerizer.dll # bin/OpenMetaverse.StructuredData.dll # bin/OpenMetaverse.dll # bin/OpenMetaverseTypes.dll		2020-06-29 01:28:33 +01:00
..
Addons	give/use the new group power	2020-06-18 14:33:14 +01:00
ApplicationPlugins	code aesthetics	2018-11-17 17:05:28 +00:00
Capabilities	some changes on viewer caps detection	2020-06-09 18:43:26 +01:00
ConsoleClient	mantis 8678: try fix rest console client	2020-05-01 17:49:11 +01:00
Data	missed other	2020-06-25 21:47:57 +01:00
Framework	Merge branch 'master' into uglysky	2020-06-29 01:28:33 +01:00
Region	Merge branch 'master' into uglysky	2020-06-29 01:28:33 +01:00
Server	save/load environments to/from oars	2020-06-22 15:46:39 +01:00
Services	replace lightshare early work	2020-06-10 09:26:55 +01:00
Tests	misspell all across the board	2020-06-18 12:01:53 +01:00
Tools	Massive console refactor. Greatly simplify interface.	2019-08-20 23:28:59 +01:00