aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-04-141-5/+30
|\
| * Add GroupPosition and GetWorldPosition() checks to TestGetRootPartPosition()Justin Clark-Casey (justincc)2012-04-141-1/+3
| * minor: make test names consistentJustin Clark-Casey (justincc)2012-04-141-1/+1
| * refactor: move common init code into SetUp() in SceneObjectSpatialTestsJustin Clark-Casey (justincc)2012-04-141-8/+13
| * refactor: put SOG position test in a separate TestSceneObjectGroupPosition()Justin Clark-Casey (justincc)2012-04-141-1/+17
| * Add simple RelativePosition and OffsetPosition checks to TestGetRootPartPositionJustin Clark-Casey (justincc)2012-04-141-0/+2
* | Merge branch 'master' into careminsterMelanie2012-04-141-0/+65
|\ \ | |/
| * Add very basic TestGetRootPartPosition() testJustin Clark-Casey (justincc)2012-04-141-0/+65
* | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ...Melanie2012-04-132-273/+196
|\ \
| * | make llGetGeometricCenter() work as in current SL. Now this is not real geom ...UbitUmarov2012-04-092-10/+49
| * | sop.AddToPhysics(..) fixed and in use. For now it seems it needs to set sop....UbitUmarov2012-04-091-263/+147
* | | Merge branch 'master' into careminsterMelanie2012-04-135-69/+125
|\ \ \ | | |/ | |/|
| * | Mantis 55025 Implement script time.Talun2012-04-125-8/+84
* | | Merge branch 'master' into careminsterMelanie2012-04-111-0/+3
|\ \ \ | |/ /
| * | New OS scripting functions osSetTerrainTexture and osSetTerrainHeight as orig...Snoopy Pfeffer2012-04-101-0/+3
* | | Merge branch 'master' into careminsterMelanie2012-04-096-3/+135
|\ \ \ | |/ / | | / | |/ |/|
| * Mantis5502 implementation of some of the new constantsTalun2012-04-095-2/+131
| * Addresses mantis #5846Diva Canto2012-04-081-1/+3
* | Merge branch 'master' into careminsterMelanie2012-04-076-59/+218
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-04-064-97/+128
| |\
| | * Rather than having a FromFolderID property on every single prim and only ever...Justin Clark-Casey (justincc)2012-04-072-6/+15
| | * Store FromItemID for attachments once on SOG instead of on every SOP and only...Justin Clark-Casey (justincc)2012-04-073-19/+13
| | * refactor: Eliminate unnecessary SOP.m_physActorJustin Clark-Casey (justincc)2012-04-061-10/+1
| | * Fix llGetLinkPrimParams for PRIM_POS_LOCAL for child prims whether in scene o...Justin Clark-Casey (justincc)2012-04-061-3/+13
| | * For llGetMass(), return the mass of the avatar is the object is attached.Justin Clark-Casey (justincc)2012-04-061-0/+16
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-04-061-20/+63
| | |\
| | * | 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-061-0/+49
| | |/ | |/|
| * | If an AddItem fails, try adding it to the right folder type.Diva Canto2012-04-061-20/+63
| |/
* | 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
* | Fix the last merge artefactsMelanie2012-04-032-5/+5
* | More artefactMelanie2012-04-031-1/+1
* | Fix more merge artefactsMelanie2012-04-031-3/+3
* | Remove duplicate implementation of Material { get; set; }Melanie2012-04-031-14/+0
* | Fix merge artefactsMelanie2012-04-032-27/+2
* | Merge branch 'master' into careminsterMelanie2012-04-034-107/+201
|\ \ | |/
| * Eliminate race condition where many callers would check SOP.PhysicsActor != n...Justin Clark-Casey (justincc)2012-04-034-150/+204
* | Merge branch 'master' into careminsterMelanie2012-03-317-65/+138
|\ \ | |/
| * refactor: Rename SOG.GetChildPart() to GetPart() since it can also return the...Justin Clark-Casey (justincc)2012-03-315-29/+29
| * Rename SOG.HasChildPrim(uint) to SOG.ContainsPart(uint) to match existing Con...Justin Clark-Casey (justincc)2012-03-312-32/+21
| * minor: small message adjustment and unnecessary code elimination when notifyi...Justin Clark-Casey (justincc)2012-03-311-1/+1
| * fix Infinite loading on No Rez http://opensimulator.org/mantis/view.php?id=5932PixelTomsen2012-03-311-1/+7
| * refactor: Move "friends show cache" console command out into separate Friends...Justin Clark-Casey (justincc)2012-03-301-4/+21
| * Add simple login test with online friends. Add IFriendsModule.GrantRights() ...Justin Clark-Casey (justincc)2012-03-301-2/+22
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-03-291-1/+28
| |\
| | * Also add OSS header to interfaceMelanie2012-03-291-1/+28
| * | Add back parts of reverted changes that were not concerned with child agent c...Justin Clark-Casey (justincc)2012-03-292-1/+6
| |/
| * Change namespace on CallingCardModule and correct interface file placemant. A...Melanie2012-03-291-0/+13