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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| \| * \|	Group based access restrictions to parcels require group membership, but not ↵	Snoopy Pfeffer	2012-04-05	1	-25/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	that this group is active for that user.
\| \| * \|	Little bug fix in HasGroupAccess, to properly store the case "true" in the ↵	Snoopy Pfeffer	2012-04-05	1	-5/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	cache.
\| * \| \|	If an AddItem fails, try adding it to the right folder type.	Diva Canto	2012-04-06	1	-20/+63
\| \| \| \|
\| * \| \|	WARNING: LOTS OF COMMENTED AND UNUSED CODE IN THIS COMMIT. This is on ↵	Diva Canto	2012-04-06	2	-57/+1007
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	purpose; it's an historical record of what works and what doesn't wrt manipulating inventory at the viewer. I'll remove the unused code in a subsequent commit, but wanted to place it in history. The uncommented code works.
\| * \| \|	A few minor tweaks here and there in XInventoryService.	Diva Canto	2012-04-06	1	-14/+48
\| \| \| \|
\| * \| \|	Finish the implementation of GetUserInventory, even though it's still not used.	Diva Canto	2012-04-06	6	-33/+201
\| \| \| \|
\| * \| \|	Packing of folder in SendBulkUpdateInventory always set the folder type to ↵	Diva Canto	2012-04-06	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	-1. Not sure if there's a reason for it, but I'm changing it to the given folder type.
\| * \| \|	Guard against null inventory contents.	Diva Canto	2012-04-06	1	-2/+2
\| \| \| \|
\| * \| \|	Thank you, BaseHttpServer, for telling me where things go wrong.	Diva Canto	2012-04-06	1	-2/+2
\| \| \| \|
* \| \| \|	Merge branch 'ubitwork'	Melanie	2012-04-04	6	-145/+462
\|\ \ \ \
\| * \| \| \|	minor changes.. a few physicsactor -> pa and a use a constant with \|'ed ↵	UbitUmarov	2012-04-04	1	-35/+31
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	bit fields in place of 6 individual checks \|\|'ed
\| * \| \| \|	remove more merge artefacts	UbitUmarov	2012-04-04	1	-10/+3
\| \| \| \| \|
\| * \| \| \|	reverted changes to llApplyRotationalImpulse execution in SOP/SOG. This ↵	UbitUmarov	2012-04-04	2	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	functions naming is misleading, Here Apply means to apply a instante impulse that may add to previus unprocessed ones and not setting a permanente torque (that is done by llSetTorque).
\| * \| \| \|	Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork	UbitUmarov	2012-04-04	18	-124/+261
\| \|\ \ \ \
\| * \ \ \ \	Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork	UbitUmarov	2012-04-01	49	-340/+1604
\| \|\ \ \ \ \
\| * \| \| \| \| \|	reduced instability in vertical atractor with eficiency of 1 and banking	UbitUmarov	2012-03-31	1	-9/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	this will need a nicer solution sometime...
\| * \| \| \| \| \|	Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork	UbitUmarov	2012-03-28	28	-123/+730
\| \|\ \ \ \ \ \
\| * \ \ \ \ \ \	Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork	UbitUmarov	2012-03-27	20	-61/+128
\| \|\ \ \ \ \ \ \
\| * \ \ \ \ \ \ \	Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork	UbitUmarov	2012-03-27	1	-13/+49
\| \|\ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \	Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork	UbitUmarov	2012-03-26	29	-295/+794
\| \|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	UbitOde let caller try to build meshs like done in chode. Changing this was ↵	UbitUmarov	2012-03-24	2	-3885/+3959
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	a bad move i made. Variable colisions softness.
\| * \| \| \| \| \| \| \| \| \|	Avatars have no bounce	UbitUmarov	2012-03-24	3	-3705/+3955
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork	UbitUmarov	2012-03-23	42	-269/+883
\| \|\ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \	Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork	UbitUmarov	2012-03-22	1	-1/+1
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Framework/PriorityQueue.cs
\| * \| \| \| \| \| \| \| \| \| \| \|	reverted priorityQueue changes	UbitUmarov	2012-03-21	1	-8/+3
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' into careminster	Melanie	2012-04-05	0	-0/+0
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Simplify group access checks and break them out into a separate method.	Melanie	2012-04-05	1	-57/+49
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use existing cache if the avatar is within the region and use an ExpiringCache to cache status if the avatar is not in the region. The 30 second delay now applies to scripted objects ony and only when the owner is not present.
* \| \| \| \| \| \| \| \| \| \| \| \|	Remove some unneeded parens	Melanie	2012-04-04	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Adjust Snoopy's contribution for AVN	Melanie	2012-04-05	1	-56/+14
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' into careminster	Melanie	2012-04-04	1	-1/+57
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| / / / \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Implements group based access restrictions for parcels of land. Because of ↵	Snoopy Pfeffer	2012-04-05	1	-1/+57
\| \| \|_\|_\|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	caching there can be a delay of up to 30 seconds until the access rights are effectively changed for a user.
* \| \| \| \| \| \| \| \| \| \|	Fix the last merge artefacts	Melanie	2012-04-03	2	-5/+5
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	More artefact	Melanie	2012-04-03	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Fix more merge artefacts	Melanie	2012-04-03	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Remove duplicate implementation of Material { get; set; }	Melanie	2012-04-03	1	-14/+0
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Fix merge artefacts	Melanie	2012-04-03	2	-27/+2
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' into careminster	Melanie	2012-04-03	18	-117/+293
\|\ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / \| \| \| \| \| \| \| \| \| / / \| \|_\|_\|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
\| * \| \| \| \| \| \| \| \|	terrain save-tile extensions Signed-off-by: Garmin Kawaguichi ↵	Garmin Kawaguichi	2012-04-03	11	-3/+74
\| \| \|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	<garmin.kawaguichi@magalaxie.com> Signed-off-by: Melanie <melanie@t-data.com>
\| * \| \| \| \| \| \| \|	Fix more SOP.PhysActor race conditions in LSL_Api	Justin Clark-Casey (justincc)	2012-04-03	1	-7/+19
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Eliminate race condition where many callers would check SOP.PhysicsActor != ↵	Justin Clark-Casey (justincc)	2012-04-03	6	-155/+209
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	null then assume it was still not null in later code. Another thread could come and turn off physics for a part (null PhysicsActor) at any point. Had to turn off localCopy on warp3D CoreModules section in prebuild.xml since on current nant this copies all DLLs in bin/ which can be a very large number with compiled DLLs No obvious reason for doing that copy - nothing else does it.
* \| \| \| \| \| \| \| \|	Merge branch 'master' into careminster	Melanie	2012-03-31	0	-0/+0
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / /
\| * \| \| \| \| \| \| \|	Implement bulk inventory update over CAPS (not recursive by design,	Melanie	2012-03-31	1	-1/+47
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	do NOT CHANGE THIS, needed for HG 2.0)
* \| \| \| \| \| \| \| \|	Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵	Melanie	2012-03-31	4	-17/+90
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	careminster
\| * \| \| \| \| \| \| \| \|	Implement bulk inventory update over CAPS (not recursive by design,	Melanie	2012-03-31	1	-1/+47
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	do NOT CHANGE THIS, needed for HG 2.0)
\| * \| \| \| \| \| \| \| \|	Cache the last maptile and return the cachrd tile if the last request is	Melanie	2012-03-29	1	-8/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	less than an hour ago. Avoids generating the maptile twice on startup.
\| * \| \| \| \| \| \| \| \|	Allow the map tile module to be enabled without also eabling refresh	Melanie	2012-03-29	1	-8/+11
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Allow llTeleportAgent to work in attachments	Melanie	2012-03-29	1	-0/+10
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'master' into careminster	Melanie	2012-03-31	34	-428/+947
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \|/\| / / / / / / / / \| \|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Tests/Common/Mock/TestClient.cs
\| * \| \| \| \| \| \| \|	refactor: Rename SOG.GetChildPart() to GetPart() since it can also return ↵	Justin Clark-Casey (justincc)	2012-03-31	7	-31/+31
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	the 'root' part.
\| * \| \| \| \| \| \| \|	Rename SOG.HasChildPrim(uint) to SOG.ContainsPart(uint) to match existing ↵	Justin Clark-Casey (justincc)	2012-03-31	4	-39/+28
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ContainsPart method and remove method duplication. HasChildPrim is also misleading since the 'root' prim can also be returned.