opensim-SC_OLD - My fork of OpenSim for IG and MG, called SledjChisl.

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge of ubitworkvarnew with opensim/master as of 20150905.	Robert Adams	2015-09-08	2	-2/+2
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| *	More namespace and dll name changes. Still no functional changes.	Diva Canto	2015-08-30	2	-2/+2
\| \|
\| *	Renamed the namespaces too	Diva Canto	2015-08-30	2	-2/+2
\| \|
* \|	seems to compile ( tests comented out)	UbitUmarov	2015-09-02	2	-485/+19
\| \|
* \|	bad merge?	UbitUmarov	2015-09-01	4	-151/+805
\|\ \ \| \|/ \|/\|
\| *	minor changes	UbitUmarov	2015-08-31	1	-15/+21
\| \|
\| *	stop sending parcel overlays on parcels crossings since SL seems to have	UbitUmarov	2015-08-28	1	-1/+2
\| \| \| \| \| \| \| \|	stop sending also
\| *	try to implement core load oar options	UbitUmarov	2015-08-24	1	-73/+125
\| \|
\| *	varregion: update LandManagementModule and LandObject for variable sized ↵	Robert Adams	2015-03-29	2	-106/+133
\| \| \| \| \| \| \| \|	regions.
\| *	fix parcel proprieties update sending	UbitUmarov	2014-10-26	1	-4/+7
\| \|
\| *	persist script changes to mediaURL and musicURL ( heavy thing )	UbitUmarov	2014-09-30	1	-0/+2
\| \|
\| *	fix musicURL change being sent back with wrong snap_selection, and not	UbitUmarov	2014-09-30	1	-22/+20
\| \| \| \| \| \| \| \|	sent to other avatars.
\| *	missing currentParcelUUID update	UbitUmarov	2014-08-03	1	-0/+1
\| \|
\| *	mess update ( hide avatars )	UbitUmarov	2014-08-03	1	-8/+12
\| \|
\| *	add some filters for NPCs	UbitUmarov	2014-08-02	2	-0/+7
\| \|
\| *	handle change of hide avatars flag. Parcel limits edition still need work	UbitUmarov	2014-08-01	1	-10/+17
\| \|
\| *	remove unnecessary sendparceloverlay	UbitUmarov	2014-08-01	1	-1/+1
\| \|
\| *	MESS: changes in MakeRootAgent and CompleteMovement reordering things.	UbitUmarov	2014-07-31	2	-5/+29
\| \| \| \| \| \| \| \| \| \| \| \|	Added sending of land overlay and parcel information. This in order to only send avatar related information after having its position well defined and on the right parcel. THIS MAY STILL BE BAD :)
\| *	changes to parcels code (still more to to)	UbitUmarov	2014-07-30	2	-77/+134
\| \|
\| *	Correct nomenclature for LLSD messages. LL sure suck	Melanie Thielker	2014-07-29	1	-4/+4
\| \|
\| *	Try to plumb the other half	Melanie Thielker	2014-07-29	2	-0/+16
\| \|
\| *	Change some ORs to assignments as they should be	Melanie Thielker	2014-07-29	1	-5/+5
\| \|
\| *	fix the mess about exclusive fields and flags on land overlay	UbitUmarov	2014-07-29	2	-31/+34
\| \|
\| *	change parcel overlay bytes adding LocalSound.. changed others also NEEDS	UbitUmarov	2014-07-29	3	-30/+66
\| \| \| \| \| \| \| \|	checking
\| *	Merge branch 'master' of ssh://3dhosting.de/var/git/careminster	Melanie Thielker	2014-06-21	2	-65/+189
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
\| \| *	Merge branch 'master' into careminster	Melanie	2013-11-23	1	-47/+129
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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-06-23	1	-10/+10
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Framework/Monitoring/BaseStatsCollector.cs OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
\| \| * \ \	Merge branch 'avination-current' into careminster	Melanie	2013-06-06	1	-0/+2
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs OpenSim/Region/Framework/Interfaces/IDynamicMenuModule.cs OpenSim/Region/OptionalModules/ViewerSupport/DynamicMenuModule.cs OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
\| \| * \ \ \	Merge branch 'master' into careminster	Melanie	2013-05-12	2	-8/+50
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs OpenSim/Region/Framework/Scenes/Scene.cs
\| * \| \| \| \| \|	Differentiate between requests only the owner should be able to do and those	Melanie Thielker	2014-04-26	2	-17/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	that managers can do when setting parcel data
\| * \| \| \| \| \|	minor: Remove unused System.Linq reference and use ParcelFlags.None instead ↵	Justin Clark-Casey (justincc)	2014-04-23	1	-2/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	of 0 from previous commit cb1f28
\| * \| \| \| \| \|	Prevent sending Land Properties for unprivileged users	Dev Random	2014-04-23	1	-5/+8
\| \| \|_\|/ / / \| \|/\| \| \| \|
\| * \| \| \| \|	Reset "Show in search" on parcels cut off other parcels that are in search	Melanie	2013-05-24	1	-0/+2
\| \|/ / / /
\| * \| \| \|	Merge branch 'master' into careminster	Melanie	2013-03-15	1	-0/+5
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Framework/Servers/BaseOpenSimServer.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
\| * \ \ \ \	Merge branch 'avination' into careminster	Melanie	2013-01-06	1	-0/+13
\| \|\ \ \ \ \
\| \| * \| \| \| \|	check land permitions on sit target for unscripted sits	UbitUmarov	2013-01-03	1	-0/+13
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'master' into careminster	Melanie	2013-01-04	2	-25/+82
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
\| * \ \ \ \ \ \	Merge branch 'master' into careminster	Melanie	2012-12-07	1	-1/+3
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.cs
\| * \ \ \ \ \ \ \	Merge branch 'master' into careminster	Melanie	2012-11-25	3	-8/+9
\| \|\ \ \ \ \ \ \ \ \| \| \|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
\| * \| \| \| \| \| \| \|	Merge branch 'master' into careminster	Melanie	2012-11-13	3	-0/+6
\| \|\ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \	Merge branch 'master' into careminster	Melanie	2012-10-23	2	-0/+111
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Framework/LandData.cs
\| * \ \ \ \ \ \ \ \ \	Merge branch 'master' into careminster	Melanie	2012-10-12	1	-0/+1
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/Scene.cs
\| * \ \ \ \ \ \ \ \ \ \	Merge branch 'master' into careminster	Melanie	2012-09-16	1	-1/+1
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs OpenSim/Region/Framework/Scenes/EventManager.cs
\| * \| \| \| \| \| \| \| \| \| \| \|	stop sending duplicated parcelProprieties at login	UbitUmarov	2012-09-07	1	-18/+39
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	try to reduce potencial recursive locking	UbitUmarov	2012-09-01	1	-26/+51
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'avination' into careminster	Melanie	2012-07-06	1	-1/+1
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Remove spammy debug	Melanie	2012-06-29	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' into careminster	Melanie	2012-06-08	1	-1/+1
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
\| * \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'avination' into careminster	Melanie	2012-06-07	2	-2/+34
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \|/ / / / / / / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \| \|	Make timed bans / timed passes work as expected. Prevent transmission of media	Melanie	2012-06-07	2	-2/+34
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	URLs to banned clients.