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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'ubitworkmaster'	Melanie Thielker	2014-07-20	5	-13/+11
\|\
\| *	replace old Attachoffset by AttachedPos. Comented out possible merge	UbitUmarov	2014-07-20	5	-13/+11
\| \| \| \| \| \| \| \|	artifacts
* \|	Fix duplicate attach message being sent to objects picked up from the ground	Melanie Thielker	2014-07-20	1	-1/+4
\|/
*	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 'justincc-master'	Justin Clark-Casey (justincc)	2014-01-28	4	-24/+75
\| \| \|\ \ \ \ \ \ \
\| \| \| * \| \| \| \| \| \|	Added osGetRegionSize(), which returns the region size in meters and ↵	Oren Hurvitz	2014-01-28	3	-0/+29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	recognizes megaregions
\| \| \| * \| \| \| \| \| \|	Convert tabs to spaces from previous commit 8c2b41b01	Justin Clark-Casey (justincc)	2014-01-28	1	-27/+27
\| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \|	Make inidirectory files supercede distro files	Dev Random	2014-01-27	1	-27/+49
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Reinsert attachments list taking code in SP.MakeRootAgent()	Justin Clark-Casey (justincc)	2014-01-27	1	-14/+30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Locking attachments then launching script instances on a separate thread will not work, attachments will simply be unlocked and vulnerable to race conditions.
\| \| * \| \| \| \| \| \| \|	refactor: Remove identical part.ParentGroup.AddAvatar(UUID); calls which ↵	Justin Clark-Casey (justincc)	2014-01-27	1	-2/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	occur no matter which branch of the conditional is executed
\| \| * \| \| \| \| \| \| \|	Re-enabled NPCModuleTests.TestCreate()	Justin Clark-Casey (justincc)	2014-01-27	1	-3/+1
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Merge branch 'justincc-master'	Justin Clark-Casey (justincc)	2014-01-24	1	-21/+19
\| \| \|\ \ \ \ \ \ \ \ \| \| \| \|/ / / / / / /
\| \| \| * \| \| \| \| \| \|	minor: remove long unused state queue from "show queues" console reports	Justin Clark-Casey (justincc)	2014-01-24	1	-5/+3
\| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \|	minor: correct the usage statement on the "show image queues" console ↵	Justin Clark-Casey (justincc)	2014-01-24	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	command - should not have been "image queues show"
\| \| \| * \| \| \| \| \| \|	Skip IClientAPIs that don't implement IStatsCollector (such as NPCAvatar) ↵	Justin Clark-Casey (justincc)	2014-01-24	1	-15/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	from the "show queues" console report to stop screwing up formatting. "show pquques" already did this
\| \| * \| \| \| \| \| \| \|	Merge branch 'justincc-master'	Justin Clark-Casey (justincc)	2014-01-24	4	-320/+362
\| \| \|\ \ \ \ \ \ \ \ \| \| \| \|/ / / / / / /
\| \| \| * \| \| \| \| \| \|	Properly dispose of drawing objects to reduce/stop memory leakage on ↵	Justin Clark-Casey (justincc)	2014-01-24	4	-319/+343
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	generating map tiles with the MapImageModule and TexturedMapTileRenderer (the current defaults)
\| \| \| * \| \| \| \| \| \|	Add "generate map" console command to allow manual regeneration and storage ↵	Justin Clark-Casey (justincc)	2014-01-23	2	-1/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	of maptiles Primarily for test purposes though could be useful if one prefers to manually update the map tile
\| \| * \| \| \| \| \| \| \|	Adds a configuration option to cannibalize bandwidth from the	Mic Bowman	2014-01-20	3	-0/+30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	udp texture throttle and move it to the task throttle. Since most viewers are using http textures, the udp texture throttle is holding onto bw that could be used for more responsive prims updates. See the documentation for CannibalizeTextureRate in OpenSimDefaults.ini. Option is disabled by default.
\| \| * \| \| \| \| \| \| \|	Add back code to UuidGatherer to retrieve UUIDs for materials stored in ↵	dahlia	2014-01-20	1	-0/+73
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	DynAttrs. This is unfortunately still necessary until a better solution for handling existing legacy materials can be implemented
\| \| * \| \| \| \| \| \| \|	rather than converting existing materials to assets, just retrieve them and ↵	dahlia	2014-01-20	1	-32/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	make them available for viewing. Any new materials added to the scene will become assets.