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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \| \|	Fix coalesced objects not showing up as "piles" of prims (AVN only bug)	Melanie Thielker	2014-07-20	1	-4/+4
\| \| \| \|
\| * \| \|	Merge branch 'ubitworkmaster'	Melanie Thielker	2014-07-19	0	-0/+0
\| \|\ \ \
\| \| * \| \|	refix originalPositions[]	UbitUmarov	2014-07-19	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Fix taking objects	Melanie Thielker	2014-07-19	1	-1/+1
\| \|/ / /
\| * \| \|	Merge branch 'avination-current'	Melanie Thielker	2014-07-19	18	-1516/+700
\| \|\ \ \ \| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
\| \| * \|	revert to capsule representation of avatar collider	UbitUmarov	2014-07-19	1	-297/+28
\| \| \| \|
\| \| * \|	reduce avatar hover in basic ode plugin	UbitUmarov	2014-07-18	1	-1/+1
\| \| \| \|
\| \| * \|	fix Xengine script instance load	UbitUmarov	2014-07-18	1	-7/+6
\| \| \| \|
\| \| * \|	Merge branch 'avination-current' into ubitwork	UbitUmarov	2014-07-16	53	-472/+954
\| \| \|\ \
\| \| \| * \	Merge branch 'avination-current' of ssh://3dhosting.de/var/git/careminster ↵	UbitUmarov	2014-07-16	21	-91/+256
\| \| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into avination-current
\| \| \| * \ \	Merge branch 'avination-current' of ssh://3dhosting.de/var/git/careminster ↵	UbitUmarov	2013-09-19	36	-381/+698
\| \| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into avination-current
\| \| * \| \ \ \	Merge branch 'avination-current' into ubitwork	UbitUmarov	2013-06-08	3	-320/+1
\| \| \|\ \ \ \ \ \| \| \| \|/ / / /
\| \| \| * \| \| \|	Merge branch 'avination-current' of ssh://3dhosting.de/var/git/careminster ↵	UbitUmarov	2013-06-08	3	-320/+1
\| \| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into avination-current
\| \| * \| \| \| \| \|	add indexes for new visual parameters shape_hover and	UbitUmarov	2013-06-07	1	-1/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	APPEARANCEMESSAGE_VERSION. For reference only, this aren't used in sim for now
\| \| * \| \| \| \| \|	try to suspend and resume keyframes on copy to inventory to take copy	UbitUmarov	2013-06-06	1	-1/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	doesn't destroy state
\| \| * \| \| \| \| \|	Merge branch 'avination-current' into ubitwork	UbitUmarov	2013-06-06	1	-15/+64
\| \| \|\ \ \ \ \ \ \| \| \| \|/ / / / /
\| \| \| * \| \| \| \|	keyframe: add more locks, change timming stop, added Suspend and resume	UbitUmarov	2013-06-06	1	-15/+64
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Merge branch 'avination-current' into ubitwork	UbitUmarov	2013-06-06	4	-18/+43
\| \| \|\ \ \ \ \ \ \| \| \| \|/ / / / /
\| \| * \| \| \| \| \|	Merge branch 'avination-current' into ubitwork	UbitUmarov	2013-05-31	4	-7/+7
\| \| \|\ \ \ \ \ \
\| \| * \| \| \| \| \| \|	retouch prim stopped condition test	UbitUmarov	2013-05-29	1	-3/+3
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	removed spurius ref to ode.dll from odeapi	UbitUmarov	2013-05-29	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	correction to previus comment: all parameters but gravity modifier have	UbitUmarov	2013-05-29	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	efect on all prims.
\| \| * \| \| \| \| \| \|	let gravity modifier, friction, restitution and density changes be applied	UbitUmarov	2013-05-29	2	-6/+65
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	to prim. Only have efect on root prim. Density doesn't get effect imediatly, only on next change of size or shape. density change implies a full body rebuild to be done later, after reducing the number of sets sop does. Other parameters should work. ** mainly untested *
\| \| * \| \| \| \| \| \|	make sure friction slip parameters are zero ( or other value ) and not	UbitUmarov	2013-05-29	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	default cmf
\| \| * \| \| \| \| \| \|	missing file	UbitUmarov	2013-05-29	1	-0/+5
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	missing files	UbitUmarov	2013-05-29	2	-5/+6
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	* DANGER TESTING ** changed prims mesh generation hopefully removing	UbitUmarov	2013-05-29	9	-1178/+503
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	spurius faces. CHanged several aspects. Fixed prims inertia that was too low, still using box as model. Increased number of quickstep SOR iterations to 15. Keep it 15 even on heavy load ( will only jump simulation time).
\| * \| \| \| \| \| \| \|	fix attachments	UbitUmarov	2014-07-19	1	-7/+9
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'master' of ssh://3dhosting.de/var/git/careminster	Melanie Thielker	2014-06-21	663	-40549/+83928
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
\| \| * \ \ \ \ \ \ \	Merge branch 'master' into careminster	Melanie	2014-01-28	59	-1643/+2129
\| \| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Framework/RegionSettings.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs OpenSim/Region/Framework/Interfaces/IInterregionComms.cs OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
\| \| * \ \ \ \ \ \ \ \	Merge branch 'master' into careminster	Melanie	2014-01-28	16	-101/+265
\| \| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| \| * \| \| \| \| \| \| \| \| \|	Remove the core module extra profile settings support carried in with the latest	Melanie	2014-01-05	3	-2/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	patches. We don't need it.
\| \| * \| \| \| \| \| \| \| \| \|	Intermediate commit. Sill errors.	Melanie	2014-01-05	36	-8803/+10755
\| \| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' into careminster Conflicts: OpenSim/Data/SQLite/SQLiteUserProfilesData.cs OpenSim/Framework/RegionInfo.cs OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Services/UserProfilesService/UserProfilesService.cs
\| \| * \ \ \ \ \ \ \ \ \ \	Merge commit '92aad6f1bb45974927fa43d6fd30f98337dee3f0' into careminster	Melanie	2014-01-05	0	-0/+0
\| \| \|\ \ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \ \	Merge commit '5b73b9c4a85335ba837280688b903fef44be8f35' into careminster	Melanie	2014-01-05	0	-0/+0
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \ \ \	Merge commit '3df8990e6ff6a5293b425e906cd381da9e0424a5' into careminster	Melanie	2014-01-05	0	-0/+0
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \ \ \ \	Merge commit '97934e00e667b6f432340a54671221a970a048d7' into careminster	Melanie	2014-01-05	0	-0/+0
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge commit '08750501617ca332ab196b2f25030e3c635c9dd6' into careminster	Melanie	2014-01-05	1	-2/+88
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Add support for user preferences (im via email)"	Melanie	2013-12-07	14	-297/+36
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 1842388bb4dcf5ecd57732ffa877b6ca1a3dec7b.
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' into careminster	Melanie	2013-12-07	17	-48/+305
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'master' into careminster	Melanie	2013-12-07	13	-7904/+8421
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
\| \| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'master' into careminster	Melanie	2013-11-23	76	-9536/+10619
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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-11-08	34	-7618/+7968
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
\| \| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'master' into careminster	Melanie	2013-11-03	80	-259/+17602
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: 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' of ssh://melanie@3dhosting.de/var/git/careminster into ↵	Melanie	2013-10-06	6	-6/+34
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	careminster
\| \| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Fixes cases where Last Attachment Point gets overwritten with 0 when it ↵	teravus	2013-10-05	4	-4/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	shouldn't * Fixes cases where Last Attachment Point doesn't get written when it should. * Fixes Null Reference in BaseHttpServer when shutting down, null path provided. * Drop then Wear retains Last Attachment Point
\| \| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' of careminster:/var/git/careminster	teravus	2013-10-04	85	-872/+2997
\| \| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| \| \| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'master' of careminster:/var/git/careminster	teravus	2013-09-16	11	-76/+98
\| \| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| \| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* This fixes the border crossing offsets by storing the final keyframe ↵	teravus	2013-09-16	1	-2/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	location in the hijacked variable KeyFrame.AngularVelocity. When steps in OnTimer <= 0.0, normalize the final position by Constants.RegionSize and move the object there. The hack here is KeyFrame.AngularVelocity probably isn't the right name for this variable because it's the un-mucked with keyframe position. When you determine the feasibility of changing the name without affecting the serialization of existing objects in world... It's simply a name change to KeyFrame.FinalPosition or something proper. (cherry picked from commit e0399ccaec68889c12e4679b4d62142b49b379df)
\| \| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Fix a null ref that causes a stack unwind when crossing borders. Less ↵	teravus	2013-09-16	3	-12/+49
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	stack unwinding.. the faster it goes. * Tweak XEngine so that it's partially functional again. It's still not great, but basic things work. (cherry picked from commit 01c3be27460fd3f28efd17b8d6606b883350f653)