aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-03-111-1/+1
|\ | | | | | | | | Conflicts: OpenSim/Region/Application/OpenSimBase.cs
| * 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.
* | Merge branch 'master' into careminsterMelanie2012-03-091-21/+4
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * 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.
* | Merge branch 'master' into careminsterMelanie2011-12-181-1/+1
|\ \ | |/
| * minor fix to MegaRegions, typo spotted by Ubit!nebadon2011-12-151-1/+1
| |
* | 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
| | | | | | | | | | | | 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.
* | Merge branch 'master' into bigmergeMelanie2011-10-271-3/+1
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * 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.
| * Revamp the viewer -> banlist packet processing so fix a number of bugs.Melanie2010-12-131-1/+1
| | | | | | | | | | | | | | 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-131-1/+1
| | | | | | | | | | | | | | 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-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-03-301-12/+13
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJohn Hurliman2010-03-191-2/+1
| |\
| | * Unify a previous refactor of object return with the older solution. WeMelanie2010-03-181-2/+1
| | | | | | | | | | | | 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-181-2/+1
|/ | | | really don't need two methods doing the same thing, but differently.
* 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-111-0/+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.
* * Update namespace in the regioncombinermodule.Teravus Ovares (Dan Olivares)2009-11-101-1/+1
|
* * Move RegionCombinerModule to it's own projectTeravus Ovares (Dan Olivares)2009-11-101-0/+964
* Moves the mono_metadata_token_from_dor message to a different module on loading.
generated by cgit v1.1 at 2024-11-20 17:46:41 +0000