aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/RegionCombinerModule (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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 ↵Justin Clark-Casey (justincc)2011-01-271-2/+2
| | | | | | | | | | | | | | | | parcels from the OAR. The region spanning parcel shouldn't exist in this situation. If it does, when the land data is loaded it is repersisted with a local ID which comes after the ones loaded via the oar, which obliterates the oar loaded one. Resaving the data we just loaded from the database is somewhat odd in itself (though this makes sense from the way that OAR loading was already using the same event).
| * Fix OAR parcel loading so that old parcels are replaced by the new instead ↵Justin Clark-Casey (justincc)2011-01-271-0/+5
| | | | | | | | | | | | of merged. The --merge switch will still merge the old and new land parcelling.
| * Revamp the viewer -> banlist packet processing so fix a number of bugs.Melanie2010-12-132-3/+3
| | | | | | | | | | | | | | Remove the too coarse CanEditParcel method in favor of a CanEditParcelProperties method that takes a GroupPowers argument to specify what action is to be taken. Also, make the method to set parcel data much more granular. Permissions in a deeded setting should now work.
* | Revamp the viewer -> banlist packet processing so fix a number of bugs.Melanie2010-12-132-3/+3
| | | | | | | | | | | | | | Remove the too coarse CanEditParcel method in favor of a CanEditParcelProperties method that takes a GroupPowers argument to specify what action is to be taken. Also, make the method to set parcel data much more granular. Permissions in a deeded setting should now work.
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-132-5/+5
|\ \ | |/ | | | | | | The modules will need to be updated for this to compile and run again. Please don't use until I do the companion commit to modules later on.
| * 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
| | | | | | | | restored to some heavy casting in order to preserve RegionCombinerModule semantics, pending better events.
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-06-091-1/+3
|\ \ | |/
| * Refactor SendCoarseLocations for better performance. Instead of computing ↵Dan Lake2010-06-081-1/+3
| | | | | | | | list of all locations fresh for every scene presence on every frame, we will instead compute the list once every 50 frames and send to all connected presences at that time. Also, we only add 60 items to the list when there are more than 60 presences in the scene. For 1000 users, this change yields a 99.8% reduction in list processing and a 98% reduction in network bandwidth for coarse locations.
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-05-211-0/+10
|\ \ | |/
| * Implements three new OSSL functions for parcel management: osParcelJoin ↵OpenSim Master2010-05-131-0/+10
| | | | | | | | joins parcels in an area, osParcelSubdivide splits parcels in an area, osParcelSetDetails sets parcel name, description, owner and group owner. Join and Subdivide methods in LandChannel are exposed.
* | 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
| | | | | | | | | | | | really don't need two methods doing the same thing, but differently.
| * | Cleaned up access to scenepresences in scenegraph. GetScenePresences and ↵Dan Lake2010-03-191-12/+13
| |/ | | | | | | GetAvatars have been removed to consolidate locking and iteration within SceneGraph. All callers which used these to then iterate over presences have been refactored to instead pass their delegates to Scene.ForEachScenePresence(Action<ScenePresence>).
| * * Attempts to resolve the megaregion terrain edit rebound.Teravus Ovares (Dan Olivares)2009-12-291-0/+82
| | | | | | | | | | | | * It does this by tweaking the throttles on child agent connection to a megaregion and multiplying the land throttle by 50. (various bit and byte magic ensue) * While, I doubt this will cause terrain crater sized potholes.. since it actually increases the bandwidth available for land in child regions when MegaRegions area active, more testing would be good. * This, in theory, also shouldn't cause missing objects in child regions.. because all objects are in the root region anyway. As I said, more testing would be good.
* | Unify a previous refactor of object return with the older solution. WeMelanie2010-03-182-10/+4
|/ | | | really don't need two methods doing the same thing, but differently.
* 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, ↵Teravus Ovares (Dan Olivares)2009-11-112-13/+5
| | | | miguel, and the fabulous bug reports by our community members.. The workaround fix for the "ERROR:metadata.c:3211:mono_metadata_token_from_dor: code should not be reached" bug in the RegionCombinerModule.
* * 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
* Moves the mono_metadata_token_from_dor message to a different module on loading.