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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'avination' into careminster	Melanie	2012-10-18	1	-2/+2
\|\ \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Framework/WebUtil.cs OpenSim/Region/Physics/OdePlugin/OdeScene.cs
\| *	Merge branch 'ubitwork' into avination	Melanie	2012-10-17	1	-2/+2
\| \|\
\| \| *	[DANGER UNTESTED] ODE mesh assets. Other plugins will not do meshs/sculpts	UbitUmarov	2012-10-07	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \|	now
* \| \|	Merge branch 'avination' into careminster	Melanie	2012-10-17	1	-0/+15
\|\ \ \ \| \|/ /
\| * \|	Fix perms when linking an object. Set root part perms to the perms	Melanie	2012-10-14	1	-0/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	of the link set to make the build floater behave consistently. Fixes permissions exploit introduced on 23 August.
\| * \|	Change permissions on child prim inventory items when god mode "force	Melanie	2012-10-08	1	-0/+8
\| \|/ \| \| \| \| \| \|	permissive" is used.
* \|	Remove a core undo call that we don't need.	Melanie	2012-09-27	1	-2/+0
\| \|
* \|	Make it possible to rescale SOGs when they are not in a scene.	Justin Clark-Casey (justincc)	2012-09-27	1	-23/+30
\| \|
* \|	Merge branch 'master' into careminster	Melanie	2012-09-16	1	-7/+8
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs OpenSim/Region/Framework/Scenes/EventManager.cs
\| * \|	Fix indentation and issues where tabs were used instead of spaces in commit ↵	Justin Clark-Casey (justincc)	2012-09-12	1	-7/+8
\| \| \| \| \| \| \| \| \| \| \| \|	783ee949
* \| \|	Merge branch 'avination' into careminster	Melanie	2012-09-10	1	-1/+5
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	Refactor avatar transfer so that the heavy (UpdateAgent) part is separated into	Melanie	2012-09-04	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	it's own sub-method
\| * \|	move keyframemotion.copy from sop.copy to sog.copy, where there is	UbitUmarov	2012-08-30	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \|	newgroup information avaiable.
* \| \|	Merge branch 'master' into careminster	Melanie	2012-09-09	1	-0/+18
\|\ \ \ \| \| \|/ \| \|/\| \| \| \| \| \| \|	Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
\| * \|	implementing per-region configuration of limits on the number of prims one ↵	SignpostMarv	2012-09-09	1	-0/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	can have in a linkset Applied with changes - patch was based on a repo different from core Signed-off-by: Melanie <melanie@t-data.com>
\| * \|	Fix bad child prim permissions that can make objects change perms after rezzing	Melanie	2012-08-24	1	-3/+15
\| \| \| \| \| \| \| \| \| \| \| \|	Port from Avination
* \| \|	Merge branch 'avination' into careminster	Melanie	2012-08-31	1	-7/+17
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork	UbitUmarov	2012-08-30	1	-1/+2
\| \|\ \
\| \| * \	Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork	Melanie	2012-08-29	1	-5/+22
\| \| \|\ \
\| \| * \| \|	Fix a nullref while object is being created	Melanie	2012-08-28	1	-1/+2
\| \| \| \| \|
\| * \| \| \|	[possible still bad] make use of keyframemotion.copy on sop.copy, replacing	UbitUmarov	2012-08-30	1	-10/+2
\| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	fromdata(seralize). for now its called with null group since sop.copy() hasn't usable new group information, so for copied keyframes be fully operational UpdateSceneObject(newgroup) needs to be called on them.
\| * \| \|	A few more changes to keyframes	UbitUmarov	2012-08-29	1	-2/+2
\| \| \| \|
\| * \| \|	[possible still very broken] mess around keyframes. timer events	UbitUmarov	2012-08-28	1	-6/+23
\| \|/ / \| \| \| \| \| \| \| \| \|	threads overlaps, some null objects exceptions, region crossing...
* \| \|	Merge branch 'avination' into careminster	Melanie	2012-08-24	1	-3/+15
\|\ \ \ \| \|/ /
\| * \|	Fix bad child prim permissions that can make objects change perms after rezzing	Melanie	2012-08-23	1	-3/+15
\| \| \|
* \| \|	Merge branch 'avination' into careminster	Melanie	2012-08-23	1	-0/+2
\|\ \ \ \| \|/ /
\| * \|	Cause a persistence save if prim flags change	Melanie	2012-08-21	1	-0/+2
\| \| \|
* \| \|	Merge branch 'master' into careminster	Melanie	2012-08-18	1	-6/+54
\|\ \ \ \| \|/ / \|/\| / \| \|/ \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
\| *	enables configurable minimum sizes for physical & non-physical prims	SignpostMarv	2012-08-15	1	-6/+54
\| \|
* \|	Remove AreUpdatesSuspended flag because it does nothing	Melanie	2012-08-16	1	-17/+0
\| \|
* \|	Change case of areUpdatesSuspended to upper case as is proper for a property	Melanie	2012-08-16	1	-1/+1
\| \|
* \|	Merge branch 'master' into careminster	Melanie	2012-08-04	1	-1/+1
\|\ \ \| \|/ \| \| \| \| \| \|	Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
\| *	Restore SOG constructor chaining removed in recent 513b77b. This is not a ↵	Justin Clark-Casey (justincc)	2012-08-03	1	-1/+1
\| \| \| \| \| \| \| \|	functional change.
* \|	Merge branch 'master' into careminster	Melanie	2012-08-03	1	-0/+10
\|\ \ \| \|/ \| \| \| \| \| \|	Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
\| *	refactor: rename SOG.RezzingObjectID to SOG.FromPartID to match ↵	Justin Clark-Casey (justincc)	2012-08-03	1	-1/+1
\| \| \| \| \| \| \| \|	FromFolderID, FromItemID and to reflect that it's a SOP ID rather than a SOG ID.
\| *	Don't bothre setting RezzingObjectID to UUID.Zero in SOG constructor - this ↵	Justin Clark-Casey (justincc)	2012-08-03	1	-3/+4
\| \| \| \| \| \| \| \|	is already its default value as it's a struct.
\| *	Initialize the Rezzing object to UUID.Zero	Melanie	2012-08-02	1	-3/+4
\| \|
\| *	reduced-complexity implementation of function to get rezzing object key	SignpostMarv	2012-08-02	1	-0/+8
\| \| \| \| \| \| \| \|	Signed-off-by: Melanie <melanie@t-data.com>
* \|	Merge branch 'master' into careminster	Melanie	2012-07-19	1	-1/+1
\|\ \ \| \|/ \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
* \|	minor changes, removed extra parts physics updates on linking nonroot	UbitUmarov	2012-07-17	1	-2/+3
\| \| \| \| \| \| \| \|	prims
* \|	Merge branch 'avination' into careminster	Melanie	2012-07-16	1	-2/+6
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/Scene.cs
\| * \|	Revert "Add instrumentation to log finalizer being called. Suppressed for ↵	Melanie	2012-07-12	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	backup" This reverts commit ea91a36483f3eba90e16b664715d152f9eca2980.
\| * \|	Revert "Place instrumentation in the proper place. This needs reverting, too!"	Melanie	2012-07-12	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit d9b0b03aa3f92bcd860e4edb656cf6b1221776a6.
\| * \|	Place instrumentation in the proper place. This needs reverting, too!	Melanie	2012-07-11	1	-1/+1
\| \| \|
\| * \|	Add instrumentation to log finalizer being called. Suppressed for backup	Melanie	2012-07-11	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	interim copies to avoid spammage. Not for release to the grid, must be reverted first!
\| * \|	Change order of operations on backup to ensure keyframe motions are backed	Melanie	2012-07-11	1	-2/+6
\| \| \| \| \| \| \| \| \| \| \| \|	up properly
* \| \|	Merge branch 'master' into careminster	Melanie	2012-07-12	1	-17/+74
\|\ \ \ \| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
\| * \|	Many explanitory comments added to the link and delink code in	Robert Adams	2012-07-11	1	-15/+73
\| \| \| \| \| \| \| \| \| \| \| \|	SOG and SOP. Should have no functionality changes.
* \| \|	Merge branch 'master' into careminster	Melanie	2012-07-11	1	-10/+14
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Framework/Watchdog.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
\| * \|	Do not allow a script to attach a prim if its being sat upon.	Justin Clark-Casey (justincc)	2012-07-09	1	-0/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This prevents a stack overflow where a get position on the avatar will refer to the attachment which will in turn refer back to the avatar. This required recording of all sitting avatars on a prim which is done separately from recording the sit target avatar. Recording HashSet is null if there are no sitting avatars in order to save memory.