aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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-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
| * Revert "Simplify friends caching by only doing this for root agents - no func...Justin Clark-Casey (justincc)2012-03-292-3/+1
| * Revert "Add comment about setting client.SceneAgent in AddNewClient()"Justin Clark-Casey (justincc)2012-03-291-3/+0
* | Merge branch 'master' into careminsterMelanie2012-03-293-17/+6
|\ \ | |/
| * Add comment about setting client.SceneAgent in AddNewClient()Justin Clark-Casey (justincc)2012-03-291-0/+3
| * Simplify friends caching by only doing this for root agents - no functions re...Justin Clark-Casey (justincc)2012-03-282-1/+3
| * HG 2.0: added the beginning of HGSuitcaseInventoryService. Plus moved the hac...Diva Canto2012-03-281-16/+0
* | Merge branch 'master' into careminsterMelanie2012-03-282-15/+18
|\ \ | |/
| * More on switching the root folder from under the viewer. More experiments.Diva Canto2012-03-272-15/+18
* | Merge branch 'master' into careminsterMelanie2012-03-282-4/+26
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-03-271-0/+15
| |\
| | * Add "friends show cache <first-name> <last-name>" command for debugging purpo...Justin Clark-Casey (justincc)2012-03-281-0/+15
| * | HG: Switch root folders from under the viewer. Towards HG 2.0. This is guarde...Diva Canto2012-03-271-4/+11
| |/
* | Merge branch 'master' into careminsterMelanie2012-03-281-2/+10
|\ \ | |/
| * minor: Add some documentation to OnNewClient and OnClientClosed eventsJustin Clark-Casey (justincc)2012-03-281-2/+10
* | Merge branch 'master' into careminsterMelanie2012-03-272-1/+3
|\ \ | |/
| * Two new scripting functions osInviteToGroup(userID) and osEjectFromGroup(user...Snoopy Pfeffer2012-03-271-0/+2
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2012-03-2724-593/+818
| |\