aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/RegionCombinerModule (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2011-12-091-4/+5
|\
| * Fix "fix-phantoms" help message. Thanks Garmin Kawaguichi.Justin Clark-Casey (justincc)2011-12-091-4/+5
* | Merge branch 'master' into bigmergeMelanie2011-11-241-27/+27
|\ \ | |/
| * Comment out unimplemented and uncalled RegionCombinerModule.UnCombineRegion()Justin Clark-Casey (justincc)2011-11-221-27/+27
| * Rename ForEachAvatar back to ForEachScenePresence. The other changesDan Lake2011-11-031-1/+1
| * Renamed ForEachRootScenePresence to ForEachAvatar. Cleaned up calls toDan Lake2011-11-031-1/+1
* | Merge branch 'master' into bigmergeMelanie2011-10-271-3/+1
|\ \ | |/
| * Added new ForEachRootScenePresence to Scene since almost every delegate passe...Dan Lake2011-10-271-3/+1
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-04-061-5/+0
|\ \ | |/
| * remove now unused individual LandData prim counts.Justin Clark-Casey (justincc)2011-04-051-5/+0
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-01-271-0/+5
|\ \ | |/
| * When an oar is loaded, do not create a default parcel before loading the parc...Justin Clark-Casey (justincc)2011-01-271-2/+2
| * Fix OAR parcel loading so that old parcels are replaced by the new instead of...Justin Clark-Casey (justincc)2011-01-271-0/+5
| * Revamp the viewer -> banlist packet processing so fix a number of bugs.Melanie2010-12-132-3/+3
* | Revamp the viewer -> banlist packet processing so fix a number of bugs.Melanie2010-12-132-3/+3
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-132-5/+5
|\ \ | |/
| * Formatting cleanup.Jeff Ames2010-09-122-5/+5
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-07-311-6/+18
|\ \ | |/
| * remove gods event subscription to gods module from sceneJustin Clark-Casey (justincc)2010-07-301-4/+15
| * move attachment subscription events into AttachmentsModule from scene.Justin Clark-Casey (justincc)2010-07-301-3/+4
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-06-091-1/+3
|\ \ | |/
| * Refactor SendCoarseLocations for better performance. Instead of computing lis...Dan Lake2010-06-081-1/+3
* | 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