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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \| \| \| \| \|	Merge branch 'master' into careminster	Melanie	2013-04-10	1	-1/+6
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Data/MySQL/MySQLAssetData.cs OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
\| \| * \| \| \| \|	minor: Log an exception if we aren't able to delete a script state file ↵	Justin Clark-Casey (justincc)	2013-04-09	1	-1/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	rather than simply ignoring it. This should never normally happen but if it does then it can be valuable diagonstic information.
\| \| * \| \| \| \|	Fix bug where outstanding llHTTPRequests for scripts were not being aborted ↵	Justin Clark-Casey (justincc)	2013-04-04	1	-1/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	when they were deleted. This was because AsyncCommandManager was handing an item ID to IHttpRequestModule.StopHttpRequest() rather than the expected request ID. This commit also makes the http request asynchronous using BeginGetResponse() rather than doing this by launching a new thread so that we can more safely abort it via HttpWebRequest.Abort() rather than aborting the thread itself. This also renames StopHttpRequest() to StopHttpRequestsForScript() since any outstanding requests are now aborted and/or removed.
\| * \| \| \| \| \|	Merge branch 'master' into careminster	Melanie	2013-04-02	1	-2/+2
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
* \| \| \| \| \| \|	Merge commit '68c8633ba18f0a11cfc0ed04d1d0c7c59e6cec76'	Melanie Thielker	2014-06-21	1	-2/+2
\|\ \ \ \ \ \ \ \| \| \|/ / / / / \| \|/\| \| \| \| / \| \|_\|_\|_\|_\|/ \|/\| \| \| \| \|
\| * \| \| \| \|	Use Output instead of OutputFormat in appropriate places of XEngine status ↵	Justin Clark-Casey (justincc)	2013-04-02	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	reporting.
* \| \| \| \| \|	Differentiate between requests only the owner should be able to do and those	Melanie Thielker	2014-04-26	2	-6/+6
\| \|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	that managers can do when setting parcel data
* \| \| \| \|	* Fix a null ref that causes a stack unwind when crossing borders. Less ↵	teravus	2013-08-24	2	-11/+46
\| \|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	stack unwinding.. the faster it goes. * Tweak XEngine so that it's partially functional again. It's still not great, but basic things work.
* \| \| \|	Forward the reason to the script	Melanie	2013-06-13	1	-1/+1
\| \| \| \|
* \| \| \|	Add a result param to te money module interface	Melanie	2013-06-13	1	-2/+4
\| \|_\|/ \|/\| \|
* \| \|	Fix llTeleportAgentGlobalCoords	Melanie	2013-06-02	1	-11/+16
\| \| \|
* \| \|	Implement PERMISSION_TELEPORT and the needed checks to make it work.	Melanie	2013-06-02	2	-7/+19
\| \| \| \| \| \| \| \| \| \| \| \|	Old auth system still works as well.
* \| \|	Allow Linden trees to preserve their type when taken into inventory and ↵	Melanie	2013-05-26	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \|	rezzed again. Allow Linden trees to be sensed by LLSensor as PASSIVE objects.
* \| \|	Implement llSetContentType using the new OpenID auth support for authentication	Melanie	2013-05-05	4	-0/+21
\| \| \|
* \| \|	Add llGetPhysicsMaterial	Melanie	2013-05-04	3	-0/+18
\| \|/ \|/\|
* \|	Merge branch 'master' into careminster	Melanie	2013-03-29	2	-50/+121
\|\ \ \| \|/ \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
\| *	Added missing functionality (mainly custom headers) to llHTTPRequest.	Kevin Cozens	2013-03-29	2	-56/+128
\| \|
\| *	Merge branch 'master' of ssh://opensimulator.org/var/git/opensim	Justin Clark-Casey (justincc)	2013-03-26	2	-2/+4
\| \|\
\| \| *	Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMask	Melanie	2013-03-26	2	-2/+4
\| \| \| \| \| \| \| \| \| \| \| \|	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"
\| * \|	Make llGetLinkPrimitiveParams() and llGetPrimitiveParams() work for avatars ↵	Justin Clark-Casey (justincc)	2013-03-26	1	-30/+194
\| \|/ \| \| \| \| \| \| \| \| \| \| \| \|	in a linkset. llGetPrimitiveParams() works through PRIM_LINK_TARGET Setting via llSetLinkPrimitiveParams(), etc. not yet implemented
\| *	Merge branch 'master' into newmultiattach	Melanie	2013-03-18	6	-203/+201
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
\| \| *	Make the LSL memory functions virtual so script engines can override them if ↵	Melanie	2013-03-15	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \|	they have different memory management.
\| * \|	Multiattach, part 1	Melanie	2013-03-18	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Framework/AvatarAppearance.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
* \| \|	Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMask	Melanie	2013-03-24	2	-2/+4
\| \| \| \| \| \| \| \| \| \| \| \|	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 'avination' into careminster	Melanie	2013-03-19	1	-1/+1
\|\ \ \
\| * \| \|	Fix case where the string member of a LSL_String in a list is null	root	2013-03-16	1	-1/+1
\| \| \| \|
* \| \| \|	Merge branch 'master' into careminster	Melanie	2013-03-15	2	-132/+132
\|\ \ \ \ \| \| \|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Framework/Servers/BaseOpenSimServer.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
\| * \| \|	refactor: make llGetLinkName() and llGetLinkKey() use a common ↵	Justin Clark-Casey (justincc)	2013-03-15	1	-84/+80
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	GetLinkEntity() method
\| * \| \|	minor: remove mono compiler warnings in LSL_Api.cs	Justin Clark-Casey (justincc)	2013-03-14	1	-3/+3
\| \| \| \|
\| * \| \|	refactor: minor cleanup in osGetAvatarList()	Justin Clark-Casey (justincc)	2013-03-14	1	-2/+1
\| \| \| \|
\| * \| \|	Fix bug in osCauseHealing() if called with an avatar ID for an avatar that ↵	Justin Clark-Casey (justincc)	2013-03-14	1	-13/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	is not in the scene.
\| * \| \|	minor: Use more compact libomv primitive constructors in osNpcGetPos() and ↵	Justin Clark-Casey (justincc)	2013-03-14	1	-6/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	osNpcGetRot()
\| * \| \|	Fix minor race conditions in OSSL_Api functions where a parcel could be ↵	Justin Clark-Casey (justincc)	2013-03-14	1	-6/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	misidentified for moving prims.
\| * \| \|	refactor: Use LSL_Vector(Vector3) constructor in llCastRay()	Justin Clark-Casey (justincc)	2013-03-14	1	-1/+1
\| \| \| \|
\| * \| \|	refactor: Use ILandChannel.GetLandObject(Vector3) in LSL_Api rather than ↵	Justin Clark-Casey (justincc)	2013-03-14	1	-41/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	having to continually take intermediate Vector3s to avoid race conditions
\| * \| \|	Fix minor race condition in llGetCameraRot() where inconsistent information ↵	Justin Clark-Casey (justincc)	2013-03-14	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	could be returned for a rotating camera
\| * \| \|	Fix minor race condition in llGetCameraPos() where an inconsistent post ↵	Justin Clark-Casey (justincc)	2013-03-14	1	-4/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	could be returned for a moving camera
\| * \| \|	Fix minor race condition in llParcelMediaCommandList() where a parcel could ↵	Justin Clark-Casey (justincc)	2013-03-14	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	be misidentified for a moving prim
\| * \| \|	Fix minor race conditions in LSL_Api.GetPrimParams() for PRIM_POSITION, ↵	Justin Clark-Casey (justincc)	2013-03-14	1	-10/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PRIM_SIZE and PRIM_ROT_LOCAL This function is used by all the various llParams() and osParams() functions
\| * \| \|	Fix minor race condition in llGetGeometricCenter() if this was changing ↵	Justin Clark-Casey (justincc)	2013-03-14	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	whilst the function was called.
* \| \| \|	Merge branch 'master' into careminster	Melanie	2013-03-14	3	-45/+63
\|\ \ \ \ \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
\| * \| \|	refactor: use LSL_Rotation(Quaternion) constructor in lLGetRootRotation()	Justin Clark-Casey (justincc)	2013-03-14	1	-1/+2
\| \| \| \|
\| * \| \|	Fix minor race condition in llGetRootPosition() where inconsistent results ↵	Justin Clark-Casey (justincc)	2013-03-14	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	could be returned for moving prims
\| * \| \|	Fix minor race conditions in detecting current parcel for ↵	Justin Clark-Casey (justincc)	2013-03-14	1	-3/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	llAddToLandPassList(), llSetParcelMusicURL() and llGetParcelMusicURL() for moving prims
\| * \| \|	refactor: use LSL_Vector(Vector3) constructor in llGroundNormal()	Justin Clark-Casey (justincc)	2013-03-14	1	-1/+1
\| \| \| \|
\| * \| \|	minor: Reuse ground LSL_Vector in llGroundSlope() rather than creating a new ↵	Justin Clark-Casey (justincc)	2013-03-14	1	-1/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	one.
\| * \| \|	Fix minor race conditions in llTeleportAgent(), ↵	Justin Clark-Casey (justincc)	2013-03-14	1	-14/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	llTeleportAgentGlobalCoords(), llEjectFromLand() and llOverMyLand() where the wrong parcel could be identified for very fast moving avatars.
\| * \| \|	refactor: Use LSL_Vector(Vector3) constructor in llGetCenterOfMass()	Justin Clark-Casey (justincc)	2013-03-14	1	-2/+2
\| \| \| \|
\| * \| \|	Fix a minor race condition in llInstantMessage() where slightly wrong origin ↵	Justin Clark-Casey (justincc)	2013-03-14	1	-3/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	co-ordinates could be given for a fast moving prim
\| * \| \|	Fix minor race condition in llGetOmega() where inconsistent results could be ↵	Justin Clark-Casey (justincc)	2013-03-14	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	returned (accidentally stated that commit 1774c631 was this fix). Commit 1774c631 was actually a fix for a similar minor race condition in llGetAccel()