aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/RegionCombinerModule (unfollow)
Commit message (Collapse)AuthorFilesLines
2013-02-01Revert "Update assembly version numbers"BlueWall1-1/+1
This reverts commit 141ad829f448b9138b12be7cf99c834c1f3977ec.
2013-02-01Update assembly version numbersBlueWall1-1/+1
2012-11-15Revert "Merge master into teravuswork", it should have been avination, not ↵teravus3-25/+14
master. This reverts commit dfac269032300872c4d0dc507f4f9062d102b0f4, reversing changes made to 619c39e5144f15aca129d6d999bcc5c34133ee64.
2012-11-14Added AssemblyInfos to every dll in the OpenSim.Region namespace.Diva Canto1-0/+33
2012-10-25Changed "course" to "coarse" in several placesOren Hurvitz2-11/+11
2012-09-07Move addin attributes to RegionCombinerModule.addin.xmlBlueWall2-3/+14
Will help in automation of setting version info for addin dependencies.
2012-09-07Revert "Move addin information to RegionCombinerModule.addin.xml"BlueWall2-15/+3
This reverts commit ab446bc692782b75fd27105fc3370a16b4fc17d8. Need to look into this
2012-09-07Move addin information to RegionCombinerModule.addin.xmlBlueWall2-3/+15
Move addin information from attributes to RegionCombinerModule.addin.xml to aid in automation of addin dependency tracking.
2012-07-27Fix issue where RegionCombinerModule was not removing regions from its ↵Justin Clark-Casey (justincc)1-0/+2
dictionary on RemoveRegion(), causing a later issue if regions were restarted (removed then readded).
2012-06-05minor: Add user feedback when executing fix-phantomsJustin Clark-Casey (justincc)1-0/+2
2012-06-05Allow fix-phantoms command to appear even if CombineContiguousRegions = ↵Justin Clark-Casey (justincc)1-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!
2012-05-19Improve locking of RegionCombinerModule.m_regionsJustin Clark-Casey (justincc)1-24/+29
2012-05-19Add size of region to OAR control file. Megaregions (sw root OARs when ↵Justin Clark-Casey (justincc)1-2/+17
saved) will have a size larger than 256x256 Not yet read. Do not rely on this information yet, it may change.
2012-05-19refactor: Add RegionConnection.PosX and PosY to return position in meters ↵Justin Clark-Casey (justincc)2-30/+43
rather than copy/pasting the necessary calculations in lots of places.
2012-05-19refactor: Rename connection paramaters from "conn" and "regionConnections" ↵Justin Clark-Casey (justincc)1-127/+133
so that it's easy to tell whether they refer to the root region connection or a new region connection
2012-05-19Correct some log messages in RegionCombinerModule about the position of the ↵Justin Clark-Casey (justincc)1-5/+3
root region of a megaregion relative to an added region
2012-05-19Make the megaregion total area given to the physics module accurate instead ↵Justin Clark-Casey (justincc)1-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.
2012-05-19Remove recent IRegionCombinerModule.IsMegaregion(). In theory, there can be ↵Justin Clark-Casey (justincc)1-11/+2
more than one megaregion in a simulator, separated by water. Rename IsRootRegion() to IsRootForMegaregion()
2012-05-19Add some method doc to RegionCombinerModule. Clean up log messages.Justin Clark-Casey (justincc)1-10/+29
2012-05-19Add is_megaregion flag into oar control file. Not currently read - for ↵Justin Clark-Casey (justincc)1-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
2012-03-09Factor out common default animations code into SLUtil. LLClientView now ↵Justin Clark-Casey (justincc)1-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.
2012-03-09Simplify minimap coarse location code by just reference SP.AbsolutePositionJustin Clark-Casey (justincc)1-7/+2
This is rather than checking whether the avatar is sitting and doing its own calculation.
2012-03-09Use SP.ParentPart instead of ParentID in places where it's more efficient ↵Justin Clark-Casey (justincc)1-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.
2011-12-15minor fix to MegaRegions, typo spotted by Ubit!nebadon1-1/+1
2011-12-09Fix "fix-phantoms" help message. Thanks Garmin Kawaguichi.Justin Clark-Casey (justincc)1-4/+5
2011-11-22Comment out unimplemented and uncalled RegionCombinerModule.UnCombineRegion()Justin Clark-Casey (justincc)1-27/+27
2011-11-03Rename ForEachAvatar back to ForEachScenePresence. The other changesDan Lake1-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.
2011-11-03Renamed ForEachRootScenePresence to ForEachAvatar. Cleaned up calls toDan Lake1-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.
2011-10-27Added new ForEachRootScenePresence to Scene since almost every delegate ↵Dan Lake1-3/+1
passed to ForEachScenePresence checks for !IsChildAgent first. It consolidates child and root handling for coming refactors.
2011-04-05remove now unused individual LandData prim counts.Justin Clark-Casey (justincc)1-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.
2011-01-27When an oar is loaded, do not create a default parcel before loading the ↵Justin Clark-Casey (justincc)1-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).
2011-01-27Fix OAR parcel loading so that old parcels are replaced by the new instead ↵Justin Clark-Casey (justincc)1-0/+5
of merged. The --merge switch will still merge the old and new land parcelling.
2010-12-13Revamp the viewer -> banlist packet processing so fix a number of bugs.Melanie2-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.
2010-12-13Revamp the viewer -> banlist packet processing so fix a number of bugs.Melanie2-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.
2010-09-12Formatting cleanup.Jeff Ames2-5/+5
2010-07-30remove gods event subscription to gods module from sceneJustin Clark-Casey (justincc)1-4/+15
2010-07-30move attachment subscription events into AttachmentsModule from scene.Justin Clark-Casey (justincc)1-3/+4
restored to some heavy casting in order to preserve RegionCombinerModule semantics, pending better events.
2010-06-08Refactor SendCoarseLocations for better performance. Instead of computing ↵Dan Lake1-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.
2010-05-13Implements three new OSSL functions for parcel management: osParcelJoin ↵OpenSim Master1-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.
2010-03-19Cleaned up access to scenepresences in scenegraph. GetScenePresences and ↵Dan Lake1-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>).
2010-03-18Unify a previous refactor of object return with the older solution. WeMelanie2-10/+4
really don't need two methods doing the same thing, but differently.
2010-03-18Unify a previous refactor of object return with the older solution. WeMelanie2-10/+4
really don't need two methods doing the same thing, but differently.
2010-03-18Unify a previous refactor of object return with the older solution. WeMelanie2-10/+4
really don't need two methods doing the same thing, but differently.
2009-12-30Revert "Merge branch 'master' into careminster"Melanie1-82/+0
This reverts commit 596af3f600462fb1e467714e5b898c10aa3d838b.
2009-12-29* Attempts to resolve the megaregion terrain edit rebound.Teravus Ovares (Dan Olivares)1-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.
2009-11-25minor: add doc to a few parcel methodsJustin Clark-Casey (justincc)1-0/+1
2009-11-23Formatting cleanup.Jeff Ames1-2/+2
2009-11-11* Thanks to a little help from jhurliman, jradford, diva, mono's brajkovic, ↵Teravus Ovares (Dan Olivares)2-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.
2009-11-11* Fix resources file mappingTeravus Ovares (Dan Olivares)1-2/+2
2009-11-10* Update namespace in the regioncombinermodule.Teravus Ovares (Dan Olivares)8-8/+9