aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\
| * | When loading objects from DB, first add to scene, then call TriggerOnSceneObj...Dan Lake2012-03-271-1/+1
* | | Merge branch 'master' into careminsterMelanie2012-03-271-0/+8
|\ \ \ | | |/ | |/|
| * | HG: beginning of a more restrictive inventory access procedure (optional). Ex...Diva Canto2012-03-271-0/+8
* | | Merge branch 'master' into careminsterMelanie2012-03-261-0/+2
|\ \ \ | |/ /
| * | Add some more overloads to allow registering overloaded methods and listsMelanie2012-03-261-0/+2
* | | Merge branch 'master' into careminsterMelanie2012-03-261-1/+1
|\ \ \ | |/ /
| * | Add a hust UUID to the script invocationsMelanie2012-03-261-1/+1
| * | Fix the omission on the interface declarationMelanie2012-03-261-1/+1
| * | Dynamically create the delegate type to reduce complexity in the callerMelanie2012-03-261-1/+2
| * | Correct the design error I introduced into ScriptComms. Untested but about toMelanie2012-03-261-4/+3
* | | Fix the omission on the interface declarationMelanie2012-03-261-1/+1
* | | Dynamically create the delegate type to reduce complexity in the callerMelanie2012-03-261-1/+2
* | | Correct the design error I introduced into ScriptComms. Untested but about toMelanie2012-03-261-4/+3
* | | Merge branch 'master' into careminsterMelanie2012-03-251-1/+2
|\ \ \ | |/ /
| * | Simplify the module invocation registration. The types and method nameMelanie2012-03-251-1/+2
* | | Merge branch 'master' into careminsterMelanie2012-03-231-0/+16
|\ \ \ | |/ /
| * | Comment out log message about sending periodic appearance updates.Justin Clark-Casey (justincc)2012-03-231-2/+2
| * | Add experimental SendPeriodicAppearanceUpdates = true/false setting to [Start...Justin Clark-Casey (justincc)2012-03-231-0/+17