aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/RegionCombinerModule (follow)
Commit message (Collapse)AuthorAgeFilesLines
* bad merge?UbitUmarov2015-09-013-3/+4
|\
| * varregion: any conversions of use of Constants.RegionSize converted intoRobert Adams2015-03-291-3/+3
| | | | | | | | Util.cs routines to convert region coords to and from world coords or handles.
| * Varregion: first cut at removing Border class checks for region crossings.Robert Adams2015-03-221-259/+61
| | | | | | | | | | Added Scene.PositionIsInCurrentRegion(pos) to sense when new position needs some crossing work. Many changes made to EntityTransferModule to accomodate new crossing sense logic.
| * MESS: changes in MakeRootAgent and CompleteMovement reordering things.UbitUmarov2014-07-311-0/+1
| | | | | | | | | | | | Added sending of land overlay and parcel information. This in order to only send avatar related information after having its position well defined and on the right parcel. THIS MAY STILL BE BAD :)
| * Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie Thielker2014-06-213-34/+57
| |\ | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
| * | Differentiate between requests only the owner should be able to do and thoseMelanie Thielker2014-04-261-2/+2
| | | | | | | | | | | | that managers can do when setting parcel data
* | | Updated all occurrences of AssemblyVersion("0.8.1.*") to ↵Diva Canto2015-04-291-1/+1
| | | | | | | | | | | | AssemblyVersion("0.8.2.*")
* | | Fixed declaration switcharoo on the region combiner dll.Diva Canto2014-12-312-2/+1
| | |
* | | Renamed VERSION_NUMBER to VersionNumberDiva Canto2014-12-301-2/+2
| | |
* | | This cleans up versioning. Specifically:Diva Canto2014-12-303-15/+6
| | | | | | | | | | | | | | | | | | | | | - It establishes 4 digits for opensim versions - It uses the same number between opensim releases and mono addins versions It also eliminates the last addin.xml files that were still there, for consistency.
* | | Updated OpenSim-as-addin version from 0.5 to 0.8.1. The addin version number ↵Diva Canto2014-12-291-1/+1
| | | | | | | | | | | | doesn't need to match the release version number, but I think it's a very good idea that they do.
* | | Change assembly versions to 0.8.1Justin Clark-Casey (justincc)2014-06-171-1/+1
| | |
* | | minor: comment out currently unused RegionCombinerModule.LogHeaderJustin Clark-Casey (justincc)2014-04-021-1/+1
| | |
* | | Rewrite of mega-region code to use new form of border checking.Robert Adams2014-02-151-259/+62
| | | | | | | | | | | | | | | | | | | | | This commit eliminates all of the 'border' class and list code and replaces it with testing if in the current region. Impacts: can make a mega-region out of varregions of the same size; and mega-region combinations must be rectangular (not square but rectangular)
* | | Non-functional changes of numbers into symbolic references and a fewRobert Adams2014-02-151-0/+1
| | | | | | | | | | | | comments on what variables really mean.
* | | varregion: rename 'LegacyRegionLocX' back to 'RegionLocX' and same for Y and Z.Robert Adams2013-12-142-18/+18
| | | | | | | | | | | | | | | | | | Rename 'RegionWorldLocX' to 'WorldLocX' and same for Y and Z. This keeps the downward compatibility and follows the scheme of 'region' and 'world' location naming that is happening in the Util module.
* | | 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.
generated by cgit v1.1 at 2025-01-19 11:39:04 +0000