opensim-SC - My fork of OpenSim for IG and DG, called SledjChisl.

	Commit message (Collapse)	Author	Age	Files	Lines
*	disable some XmlResolver	UbitUmarov	2018-01-04	1	-0/+1
\|
*	recover PermissionsUtil.ApplyFoldedPermissions (well my version). its use ↵	UbitUmarov	2017-04-29	1	-7/+5
\| \| \| \|	easys code readability
*	When determining if a sim can be shut down, ignore NPCs	Melanie Thielker	2017-03-31	1	-2/+2
\|
*	Skip region restart messages and delays when there are no root agents	Melanie Thielker	2017-03-31	1	-2/+38
\|
*	Fix errors introduced by incomplete understanding of what folded perms are	Melanie Thielker	2017-01-06	1	-4/+6
\|
*	Massive tab and trailing space cleanup	Melanie Thielker	2017-01-05	2	-29/+29
\|
*	Finally remove the requirement for an InventoryItem/FolderBase object to	Melanie Thielker	2016-07-04	1	-4/+2
\| \| \| \| \| \| \| \|	be passed into inventory queries. This makes the API more homogenous and also will more clearly show coding errors related to HG inventory where the .Owner field has a meaning for a query but wasn't always set.
*	Pushed AssemblyVersion up to VersionInfo, so that we don't need to do global ↵	Diva Canto	2016-02-21	1	-1/+1
\| \| \| \|	replace anymore.
*	On to 0.8.3!	Diva Canto	2015-10-18	1	-1/+1
\| \| \| \| \|	Conflicts: OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs
*	Merge of ubitworkvarnew with opensim/master as of 20150905.	Robert Adams	2015-09-08	1	-1/+0
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This integrates the OpenSim refactoring to make physics, etc into modules. AVN physics hasn't been moved to new location. Does not compile yet. Merge branch 'osmaster' into mbworknew1
\| *	Deleted OpenSim.Framework.Communications. Moved its two remaining files to ↵	Diva Canto	2015-09-04	1	-1/+0
\| \| \| \| \| \| \| \|	OpenSim.Framework.
* \|	add lost admin_reset_land method	UbitUmarov	2015-09-06	1	-0/+47
\| \|
* \|	bad merge?	UbitUmarov	2015-09-01	1	-52/+236
\|\ \ \| \|/ \|/\|
\| *	try to implement core load oar options	UbitUmarov	2015-08-24	1	-1/+4
\| \|
\| *	rename ImapTileModule as IMAPImageUploadModule to match core	UbitUmarov	2015-08-24	1	-1/+1
\| \|
\| *	Merge branch 'mbworkvar2' into ubitvar	UbitUmarov	2015-08-19	1	-3/+3
\| \|\
\| \| *	varregion: remove use of Constants.RegionSize is various places.	Robert Adams	2015-03-28	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \|	More use of the Util routines for conversion of region handles into addresses.
\| * \|	Make log output of remote admin's restart region call reflect restart ↵	Melanie Thielker	2015-03-23	1	-2/+4
\| \|/ \| \| \| \| \| \|	cancellations properly.
\| *	Make the maptile uploader in remote admin fire and forget so the controlling ↵	Melanie Thielker	2015-03-07	1	-1/+4
\| \| \| \| \| \| \| \|	host gets a timely reply.
\| *	Add an XmlRpc method to get a region's root agent count. This is intended	Melanie Thielker	2014-11-21	1	-0/+26
\| \| \| \| \| \| \| \|	to let us restart grid regions when the last agent leaves.
\| *	Merge branch 'avination-current'	Melanie Thielker	2014-08-23	1	-0/+27
\| \|\
\| \| *	Add an admin message to refesh a region's map tile. Will be used to periodically	Melanie Thielker	2014-08-23	1	-0/+27
\| \| \| \| \| \| \| \| \| \| \| \|	rebuild the world map to clean out unused tiles.
\| * \|	put back a check for null foldedperms	UbitUmarov	2014-08-05	1	-1/+1
\| \| \|
\| * \|	Merge branch 'master' into careminster	Melanie	2014-01-28	1	-7/+5
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
\| * \ \	Merge branch 'master' into careminster	Melanie	2013-11-23	1	-4/+150
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: .gitignore OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs prebuild.xml runprebuild.bat
\| * \ \ \	Merge branch 'master' into careminster	Melanie	2013-10-06	1	-1/+1
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
\| * \ \ \ \	Merge branch 'master' into careminster	Melanie	2013-08-17	1	-15/+30
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs
\| * \ \ \ \ \	Merge branch 'master' into careminster	Melanie	2013-05-11	1	-1/+1
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Services/LLLoginService/LLLoginResponse.cs OpenSim/Services/LLLoginService/LLLoginService.cs OpenSim/Tests/Common/Mock/TestClient.cs
\| * \ \ \ \ \ \	Merge branch 'master' into careminster	Melanie	2013-05-06	1	-0/+17
\| \|\ \ \ \ \ \ \
\| * \ \ \ \ \ \ \	Merge branch 'master' into careminster	Melanie	2013-05-04	1	-0/+1
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Region/Application/OpenSimBase.cs OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
\| * \ \ \ \ \ \ \ \	Merge branch 'master' into careminster	Melanie	2013-04-04	1	-1/+1
\| \|\ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'master' into careminster	Melanie	2013-03-27	1	-0/+66
\| \|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMask	Melanie	2013-03-24	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	with our own and add export permissions as well as a new definition for "All" as meaning "all conventional permissions" rather than "all possible permissions"
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'master' into careminster	Melanie	2013-02-22	1	-1/+1
\| \|\ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \	Merge branch 'master' into careminster	Melanie	2013-02-05	1	-1/+1
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
\| * \| \| \| \| \| \| \| \| \| \| \|	Implement get version RemoteAdmin call	Melanie	2013-01-23	1	-0/+16
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Add admin_refresh_search command to RemoteAdmin	Melanie	2013-01-16	1	-0/+29
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' into careminster	Melanie	2012-11-17	1	-4/+0
\| \|\ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'master' into careminster	Melanie	2012-11-15	1	-0/+33
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'master' into careminster	Melanie	2012-09-29	1	-5/+5
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: CONTRIBUTORS.txt OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'master' into careminster	Melanie	2012-09-24	1	-74/+0
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'master' into careminster	Melanie	2012-09-16	1	-0/+7
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs OpenSim/Region/Framework/Scenes/EventManager.cs
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When regions are set to shut down the instance, always send notifications to	Melanie	2012-06-03	1	-6/+30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	all affected regions and disregard the region id parameter.
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If a region is not found on a simulator, make the health query return	Melanie	2012-05-28	1	-4/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	0 to indicate it's still starting rather than an error. There are other methods that can discover the presence of a region and slow starting regions may cause the watchdog to kill them while they start,
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' into careminster	Melanie	2012-02-04	1	-2/+2
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Data/MySQL/Resources/RegionStore.migrations OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add the ability to abort a pending restart using the viewer UI or a	Melanie	2012-01-28	1	-1/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	RemoteAdmin message
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' into careminster	Melanie	2012-01-06	1	-210/+190
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'master' into careminster	Melanie	2011-12-19	1	-1/+1
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove spammy log messages when querying sim health	Melanie	2011-12-12	1	-8/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove superfluous try block	Melanie	2011-12-08	1	-27/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|