aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
...
* Merge branch 'master' into careminsterMelanie2012-04-0727-373/+960
|\
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-04-0610-128/+268
| |\
| | * Rather than having a FromFolderID property on every single prim and only ever...Justin Clark-Casey (justincc)2012-04-074-10/+19
| | * Store FromItemID for attachments once on SOG instead of on every SOP and only...Justin Clark-Casey (justincc)2012-04-078-34/+29
| | * refactor: Eliminate unnecessary SOP.m_physActorJustin Clark-Casey (justincc)2012-04-061-10/+1
| | * Implement PRIM_POS_LOCAL on llSetPrimitiveParams() and other prim params LSL ...Justin Clark-Casey (justincc)2012-04-061-0/+1
| | * refactor: Use clearer part.ParentGroup.IsAttachment in LSL_Api.GetPartLocalPos()Justin Clark-Casey (justincc)2012-04-061-4/+4
| | * Fix llGetLinkPrimParams for PRIM_POS_LOCAL for child prims whether in scene o...Justin Clark-Casey (justincc)2012-04-062-13/+24
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-04-062-0/+82
| | |\
| | | * Addition of missing constants for llGetObjectDetails including for Mantis 5502Talun2012-04-062-0/+82
| | * | For llGetMass(), return the mass of the avatar is the object is attached.Justin Clark-Casey (justincc)2012-04-062-3/+40
| | |/
| | * Make llGetMass() return total mass of object when called on root prim.Justin Clark-Casey (justincc)2012-04-061-1/+4
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-04-0626-205/+684
| | |\
| | * | remove possible PhysActor unexpectedly null race conditions when changing pri...Justin Clark-Casey (justincc)2012-04-032-63/+74
| * | | Moved the inventory manipulation from HGEntityTransferModule to HGInventoryAc...Diva Canto2012-04-064-150/+208
| | |/ | |/|
| * | Deleted the unused and commented code from 2 commits ago.Diva Canto2012-04-062-835/+1
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-04-062-3/+49
| |\ \
| | * | Added missing refresh of group membership client side cache to the groups mod...Snoopy Pfeffer2012-04-051-1/+2
| | * | Revert last commitSnoopy Pfeffer2012-04-051-22/+25
| | * | Group based access restrictions to parcels require group membership, but not ...Snoopy Pfeffer2012-04-051-25/+22
| | * | Little bug fix in HasGroupAccess, to properly store the case "true" in the ca...Snoopy Pfeffer2012-04-051-5/+2
| * | | If an AddItem fails, try adding it to the right folder type.Diva Canto2012-04-061-20/+63
| * | | WARNING: LOTS OF COMMENTED AND UNUSED CODE IN THIS COMMIT. This is on purpose...Diva Canto2012-04-062-57/+1007
| * | | A few minor tweaks here and there in XInventoryService.Diva Canto2012-04-061-14/+48
| * | | Finish the implementation of GetUserInventory, even though it's still not used.Diva Canto2012-04-066-33/+201
| * | | Packing of folder in SendBulkUpdateInventory always set the folder type to -1...Diva Canto2012-04-061-1/+2
| * | | Guard against null inventory contents.Diva Canto2012-04-061-2/+2
| * | | Thank you, BaseHttpServer, for telling me where things go wrong.Diva Canto2012-04-061-2/+2
* | | | Merge branch 'ubitwork'Melanie2012-04-046-145/+462
|\ \ \ \
| * | | | minor changes.. a few physicsactor -> pa and a use a constant with |'ed bit...UbitUmarov2012-04-041-35/+31
| * | | | remove more merge artefactsUbitUmarov2012-04-041-10/+3
| * | | | reverted changes to llApplyRotationalImpulse execution in SOP/SOG. This funct...UbitUmarov2012-04-042-3/+3
| * | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-04-0418-124/+261
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-04-0149-340/+1604
| |\ \ \ \ \
| * | | | | | reduced instability in vertical atractor with eficiency of 1 and bankingUbitUmarov2012-03-311-9/+13
| * | | | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-03-2828-123/+730
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-03-2720-61/+128
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-03-271-13/+49
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-03-2629-295/+794
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | UbitOde let caller try to build meshs like done in chode. Changing this was ...UbitUmarov2012-03-242-3885/+3959
| * | | | | | | | | | Avatars have no bounceUbitUmarov2012-03-243-3705/+3955
| * | | | | | | | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-03-2342-269/+883
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-03-221-1/+1
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | reverted priorityQueue changesUbitUmarov2012-03-211-8/+3
* | | | | | | | | | | | | Merge branch 'master' into careminsterMelanie2012-04-050-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Simplify group access checks and break them out into a separate method.Melanie2012-04-051-57/+49
* | | | | | | | | | | | | Remove some unneeded parensMelanie2012-04-041-1/+1
* | | | | | | | | | | | | Adjust Snoopy's contribution for AVNMelanie2012-04-051-56/+14
* | | | | | | | | | | | | Merge branch 'master' into careminsterMelanie2012-04-041-1/+57
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | / / / | |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | |
| * | | | | | | | | | | Implements group based access restrictions for parcels of land. Because of ca...Snoopy Pfeffer2012-04-051-1/+57
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
generated by cgit v1.1 at 2024-11-14 22:17:04 +0000