aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/RegionCombinerModule (follow)
Commit message (Collapse)AuthorAgeFilesLines
* varregion: elimination of Constants.RegionSize from all over OpenSimulator.Robert Adams2013-11-081-2/+2
| | | | | | | Routines in Util to compute region world coordinates from region coordinates as well as the conversion to and from region handles. These routines have replaced a lot of math scattered throughout the simulator. Should be no functional changes.
* Merge branch 'master' into varregionRobert Adams2013-10-071-1/+1
|\
| * Bump OPenSimulator version and assembly versions up to 0.8.0 DevJustin Clark-Casey (justincc)2013-10-041-1/+1
| |
* | VarRegion: change RegionInfo storage of region coordinates from regionRobert Adams2013-09-282-18/+18
|/ | | | | | | | count number to integer world coordinates. Added new methods RegionWorldLoc[XY]. Refactored name of 'RegionLoc*' to 'LegacyRegionLoc*' throughout OpenSim. Kept old 'RegionLoc*' entrypoint to RegionInfo for downward compatability of external region management packages.
* Attachments module only registers when enabled. This enables alternative ↵Dan Lake2013-07-161-2/+4
| | | | attachments module implementations. All calls to Scene.AttachmentsModule are checking for null. Ideally, if we support disabling attachments then we need a null attachments module to register with the scene.
* Fix taking (and rezzing) of coalesced objects in the non-root subregions of ↵Justin Clark-Casey (justincc)2013-04-061-31/+52
| | | | | | | | | megaregions. This fixes the combined bounding box location for regions bigger than 256x256. It also fixes the position on taking coalesced objects in the non-root regions, where position checks are properly done on rez instead. It also fixes the megaregion land channel to return null if the land does not exist, which should probably also be done for the ordinary land channels rather than returning a dummy region. Inspiration from Garmin's commit in http://opensimulator.org/mantis/view.php?id=6595. Thanks!
* Add "show borders" command to show the borders of a region.Justin Clark-Casey (justincc)2013-03-231-5/+3
| | | | | This is relevant to mega-regions where the borders are very different to a regular region. Also adds some method doc and other code comments.
* Add ILandChannel.GetLandObject(Vector3 position) as this is a very common ↵Justin Clark-Casey (justincc)2013-03-141-0/+5
| | | | | | input to GetLandObject() This conforms to the existing ILandChannel.ParcelsNearPoint() method
* Deleted all AssemblyFileVersion directivesDiva Canto2013-02-191-1/+1
|
* Bump version and assembly version numbers from 0.7.5 to 0.7.6Justin Clark-Casey (justincc)2013-02-051-1/+1
| | | | | | | | This is mostly Bluewall's work but I am also bumping the general version number OpenSimulator 0.7.5 remains in the release candidate stage. I'm doing this because master is significantly adding things that will not be in 0.7.5 This update should not cause issues with existing external binary DLLs because our DLLs do not have strong names and so the exact version match requirement is not in force.
* Added AssemblyInfos to every dll in the OpenSim.Region namespace.Diva Canto2012-11-141-0/+33
|
* Changed "course" to "coarse" in several placesOren Hurvitz2012-10-252-11/+11
|
* Move addin attributes to RegionCombinerModule.addin.xmlBlueWall2012-09-072-3/+14
| | | | Will help in automation of setting version info for addin dependencies.
* Revert "Move addin information to RegionCombinerModule.addin.xml"BlueWall2012-09-072-15/+3
| | | | | This reverts commit ab446bc692782b75fd27105fc3370a16b4fc17d8. Need to look into this
* Move addin information to RegionCombinerModule.addin.xmlBlueWall2012-09-072-3/+15
| | | | Move addin information from attributes to RegionCombinerModule.addin.xml to aid in automation of addin dependency tracking.
* Fix issue where RegionCombinerModule was not removing regions from its ↵Justin Clark-Casey (justincc)2012-07-271-0/+2
| | | | dictionary on RemoveRegion(), causing a later issue if regions were restarted (removed then readded).
* minor: Add user feedback when executing fix-phantomsJustin Clark-Casey (justincc)2012-06-051-0/+2
|
* Allow fix-phantoms command to appear even if CombineContiguousRegions = ↵Justin Clark-Casey (justincc)2012-06-051-13/+11
| | | | | | | | false, since this allows one to go back from a megaregion to normal regions. Adapted from a patch by Garmin Kawaguichi in http://opensimulator.org/mantis/view.php?id=6027 Garmin says that fix-phantoms allows one to reset objects when going back from megaregion to normal regions as well as the othe rway around. Thanks!
* Improve locking of RegionCombinerModule.m_regionsJustin Clark-Casey (justincc)2012-05-191-24/+29
|
* Add size of region to OAR control file. Megaregions (sw root OARs when ↵Justin Clark-Casey (justincc)2012-05-191-2/+17
| | | | | | saved) will have a size larger than 256x256 Not yet read. Do not rely on this information yet, it may change.
* refactor: Add RegionConnection.PosX and PosY to return position in meters ↵Justin Clark-Casey (justincc)2012-05-192-30/+43
| | | | rather than copy/pasting the necessary calculations in lots of places.
* refactor: Rename connection paramaters from "conn" and "regionConnections" ↵Justin Clark-Casey (justincc)2012-05-191-127/+133
| | | | so that it's easy to tell whether they refer to the root region connection or a new region connection
* Correct some log messages in RegionCombinerModule about the position of the ↵Justin Clark-Casey (justincc)2012-05-191-5/+3
| | | | root region of a megaregion relative to an added region
* Make the megaregion total area given to the physics module accurate instead ↵Justin Clark-Casey (justincc)2012-05-191-3/+9
| | | | | | | of over-inflated. This was previously over-inflated because adding a region to the NE of the root region resulted in double counting of regions already added. An accurate extent will also be necessary for other purposes.
* Remove recent IRegionCombinerModule.IsMegaregion(). In theory, there can be ↵Justin Clark-Casey (justincc)2012-05-191-11/+2
| | | | | | more than one megaregion in a simulator, separated by water. Rename IsRootRegion() to IsRootForMegaregion()
* Add some method doc to RegionCombinerModule. Clean up log messages.Justin Clark-Casey (justincc)2012-05-191-10/+29
|
* Add is_megaregion flag into oar control file. Not currently read - for ↵Justin Clark-Casey (justincc)2012-05-191-2/+20
| | | | | | | | future use. Please do not rely on this remaining here. An adaptation of part of Garmin's patch from http://opensimulator.org/mantis/view.php?id=5975, thanks! Flag only written if the SW corner OAR is saved - this is the only one that captures object data presently (though not land or terrain data). This adds an IRegionCombinerModule interface and the necessary methods on RegionCombinerModule
* Factor out common default animations code into SLUtil. LLClientView now ↵Justin Clark-Casey (justincc)2012-03-091-1/+1
| | | | | | makes use of the SLUtil copy via a method rather than each LLClientView loading a separate copy. As per opensim-users mailing list discussion.
* Simplify minimap coarse location code by just reference SP.AbsolutePositionJustin Clark-Casey (justincc)2012-03-091-7/+2
| | | | This is rather than checking whether the avatar is sitting and doing its own calculation.
* Use SP.ParentPart instead of ParentID in places where it's more efficient ↵Justin Clark-Casey (justincc)2012-03-091-19/+7
| | | | | | | (saving extra null checks, etc.) However, it looks like we should retain SP.ParentID since it's much easier to use that in places where another thread could change ParentPart to null. Otherwise one has to clumsily put ParentPart in a reference, etc. to avoid a race.
* minor fix to MegaRegions, typo spotted by Ubit!nebadon2011-12-151-1/+1
|
* Fix "fix-phantoms" help message. Thanks Garmin Kawaguichi.Justin Clark-Casey (justincc)2011-12-091-4/+5
|
* 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
| | | | | | from previous commit which sort out which iterator is used are left intact. A discussion is needed as to what constitutes an avatar vs a ScenePresence.
* Renamed ForEachRootScenePresence to ForEachAvatar. Cleaned up calls toDan Lake2011-11-031-1/+1
| | | | | | | | | | | | | | the 3 iteration functions so more of them are using the correct iteration for the action they are performing. The 3 iterators that seem to fit all actions within OpenSim at this time are: ForEachAvatar: Perform an action on all avatars (root presences) ForEachClient: Perform an action on all clients (root or child clients) ForEachRootClient: Perform an action on all clients that have an avatar There are still a dozen places or so calling the old ForEachScenePresence that will take a little more refactoring to eliminate.
* Added new ForEachRootScenePresence to Scene since almost every delegate ↵Dan Lake2011-10-271-3/+1
| | | | passed to ForEachScenePresence checks for !IsChildAgent first. It consolidates child and root handling for coming refactors.
* remove now unused individual LandData prim counts.Justin Clark-Casey (justincc)2011-04-051-5/+0
| | | | | However, the calls to the land management module to record prims need to remain, since they were also being used to return owner object lists, etc. This is probably why prim counts were being done there in the first place.
* 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.
* Formatting cleanup.Jeff Ames2010-09-122-5/+5
|
* 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.
* 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.
* 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' 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.
* minor: add doc to a few parcel methodsJustin Clark-Casey (justincc)2009-11-251-0/+1
|