aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/RegionCombinerModule (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminster-presence-refactorMelanie2010-05-211-0/+10
|\
| * Implements three new OSSL functions for parcel management: osParcelJoin joins...OpenSim Master2010-05-131-0/+10
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-03-301-12/+13
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJohn Hurliman2010-03-192-10/+4
| |\
| | * Unify a previous refactor of object return with the older solution. WeMelanie2010-03-182-10/+4
| * | Cleaned up access to scenepresences in scenegraph. GetScenePresences and GetA...Dan Lake2010-03-191-12/+13
| |/
| * * Attempts to resolve the megaregion terrain edit rebound.Teravus Ovares (Dan Olivares)2009-12-291-0/+82
* | Unify a previous refactor of object return with the older solution. WeMelanie2010-03-182-10/+4
|/
* minor: add doc to a few parcel methodsJustin Clark-Casey (justincc)2009-11-251-0/+1
* Formatting cleanup.Jeff Ames2009-11-231-2/+2
* * Thanks to a little help from jhurliman, jradford, diva, mono's brajkovic, m...Teravus Ovares (Dan Olivares)2009-11-112-13/+5
* * Fix resources file mappingTeravus Ovares (Dan Olivares)2009-11-111-2/+2
* * Update namespace in the regioncombinermodule.Teravus Ovares (Dan Olivares)2009-11-108-8/+9
* * Move RegionCombinerModule to it's own projectTeravus Ovares (Dan Olivares)2009-11-109-0/+1781