aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.cs (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into bigmergeMelanie2011-11-061-6/+2
|\ | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
| * Convert SendKillObject to take a list of uint rather than sending oneMelanie2011-11-061-19/+13
| | | | | | | | packet per prim. More to come as we change to make use of this.
* | Merge branch 'master' into bigmergeMelanie2011-11-061-1/+5
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * HUD attachments: Removes some more messages sent to wrong clients.Snoopy Pfeffer2011-11-061-1/+10
| |
* | Fix up with core changesMelanie2011-11-051-1/+0
| |
* | Merge branch 'master' into bigmergeMelanie2011-11-051-3/+0
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * Remove enableprejump config option and associated code as this is nowMelanie2011-11-051-3/+0
| | | | | | | | fully functional and cannot be disabled because that would break timings.
* | Merge branch 'master' into bigmergeMelanie2011-11-041-39/+31
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs OpenSim/Region/CoreModules/LightShare/LightShareModule.cs OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
| * Rename ForEachAvatar back to ForEachScenePresence. The other changesDan Lake2011-11-031-4/+4
| | | | | | | | | | | | 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-42/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * Port the Avination offline messaging system to CoreMelanie2011-11-021-1/+1
| |
* | Merge branch 'master' into bigmergeMelanie2011-11-021-5/+0
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Removed redundant SceneContents property from Scene. It's the same as ↵Dan Lake2011-11-011-5/+0
| | | | | | | | SceneGraph property.
* | Merge branch 'master' into bigmergeMelanie2011-11-011-37/+0
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
| * Removed see_into_this_sim_from_neighbor configuration option.Dan Lake2011-11-011-10/+0
| |
| * Removed unused show commands from Scene.cs and SceneBase.cs. The show ↵Dan Lake2011-10-311-27/+0
| | | | | | | | modules command in OpenSim.cs now shows both shared modules and region modules.
* | Merge branch 'master' into bigmergeMelanie2011-10-311-27/+25
|\ \ | |/
| * Fix line endingsDan Lake2011-10-301-23/+23
| |
| * Experimental reorder of Heartbeat loop now simulates physics and sends ↵Dan Lake2011-10-301-29/+27
| | | | | | | | updates to clients prior to sleep. Existing behavior was to sleep BEFORE sending updates. We found this patch reduced latency to clients by 1-2 heartbeat periods.
* | Merge branch 'master' into bigmergeMelanie2011-10-301-6/+0
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
| * Remove the SyncRoot locking from Scene which was only being done around the ↵Justin Clark-Casey (justincc)2011-10-291-6/+0
| | | | | | | | | | | | main physics loop and ScenePresence position and velocity setting This is no longer necessary with ODECharacter taints (ODEPrim was already not taking part in this). BSCharacter was already tainting.
* | Merge branch 'master' into bigmergeMelanie2011-10-271-29/+31
|\ \ | |/ | | | | | | | | | | | | | | 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-29/+31
| | | | | | | | passed to ForEachScenePresence checks for !IsChildAgent first. It consolidates child and root handling for coming refactors.
* | Merge branch 'master' into bigmergeMelanie2011-10-261-1/+1
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
* | Merge commit 'e28e2d24c714c3fba1cba60097986a1c1c28c6c0' into bigmergeMelanie2011-10-251-1/+3
|\ \ | |/
| * Add new EventQueueTests with basic test to check that adding a client ↵Justin Clark-Casey (justincc)2011-10-241-1/+3
| | | | | | | | registers an http poll
* | Merge commit '9c430208769ab7fd7877093e278e8fcae02ecef3' into bigmergeMelanie2011-10-251-2/+8
|\ \ | |/
| * Get OdeScene to use passed in time step rather than hard-coded 0.089Justin Clark-Casey (justincc)2011-10-201-2/+8
| | | | | | | | However, I still don't recommend changing MinFrameTime from 0.089, high values do not work well and lower values don't seem to make much difference
* | Merge commit '6837e44d0707e501795df2d690c6005f5ba1d591' into bigmergeMelanie2011-10-251-12/+4
|\ \ | |/
| * Pass PhysicsScene.Simulate() only the MinFrameTime rather than the useless ↵Justin Clark-Casey (justincc)2011-10-201-12/+4
| | | | | | | | | | | | | | | | | | Math.Max(SinceLastFrame.TotalSeconds, MinFrameTime) SinceLastFrame was calculating the interval between any sleep that had occurred to pad out the frame time and the start of the next frame. This would usually be below MinFrameTime but occasionally if the sleep was long it would be above, often due to the time required to update the watchdog. This doesn't appear to play much practical role right now. ODE was actually ignoring it entirely. Bullet might be helped slightly by receiving a non-varying value.
* | Merge commit 'eac29396d98a4864923a69e0eb73cecdd8a225b3' into bigmergeMelanie2011-10-251-0/+40
|\ \ | |/
| * Moved HaveNeighbor utility function from ScenePresence to Scene. Fixed line ↵Dan Lake2011-10-191-0/+40
| | | | | | | | endings from previous commit.
* | Merge commit 'da794f34a56f7c88904315ae538de8f3790e6891' into bigmergeMelanie2011-10-251-3/+3
|\ \ | |/
| * Renamed and rearranged AvatarFactoryModule to eliminate redundant lookups of ↵Dan Lake2011-10-191-3/+3
| | | | | | | | scene presence by client ID.
* | Merge commit 'b9930a6305e9c8bb9197fc9dc49219f4fb7ff32c' into bigmergeMelanie2011-10-251-4/+4
|\ \ | |/
| * improve method doc on Scene.OtherRegionUp()Justin Clark-Casey (justincc)2011-10-151-4/+4
| | | | | | | | this is really just to trigger panda.
* | Merge commit 'ddf54b5537f2701deeb615ef8e1eeef20b746ea1' into bigmergeMelanie2011-10-251-3/+2
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * move see_into_this_sim_from_neighbor [Startup] flag parsing into Scene with ↵Justin Clark-Casey (justincc)2011-10-151-3/+2
| | | | | | | | the others
* | MergeMelanie2011-10-251-2/+0
| |
* | Merge commit '528cc8136e567b5bac583728fbb0235baaba2f02' into bigmergeMelanie2011-10-251-2/+10
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * fetch physical_prim switch from [Startup] config from inside scene, as is ↵Justin Clark-Casey (justincc)2011-10-151-4/+9
| | | | | | | | done for most other scene config params
* | Merge commit 'c93c9ea072f319125f466c913f5f4fe1f6864045' into bigmergeMelanie2011-10-251-2/+1
|\ \ | |/
| * factor common code out into SOP.RemoveFromPhysics()Justin Clark-Casey (justincc)2011-10-151-2/+1
| |
* | Merge commit '4e7d4330c2b2c61e64c9f82efa7b824b717b2e4d' into bigmergeMelanie2011-10-251-19/+33
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * Expose minimum frame time and update periods for experimentation.Justin Clark-Casey (justincc)2011-10-131-19/+33
| | | | | | | | | | | | | | Settings are at bottom of [Startup] in OpenSimDefaults.ini, override in OpenSim.ini to change Defaults are the same as previously. More information to come on opensim-dev shortly. Feel free to tweak but if you do please don't expect any support unless feedback on certain tweaks is explicitly requested.
* | Merge commit '128d8dfd8b355f84a71e2093e942937ca720c5c6' into bigmergeMelanie2011-10-251-4/+4
|\ \ | |/
| * refactor: Put the frame update period when temporary objects are cleaned up ↵Justin Clark-Casey (justincc)2011-10-131-4/+4
| | | | | | | | in a field, like all the other update periods
* | Merge commit 'fd274a668803bc3da4cec95180538116038b503a' into bigmergeMelanie2011-10-251-29/+1
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * refactor: chain the two scene constructors together to eliminate more copypastaJustin Clark-Casey (justincc)2011-10-131-29/+1
| |
* | Merge commit 'a6fa15e8b65a123d79a1bea8cccb459f76139314' into bigmergeMelanie2011-10-251-3/+4
|\ \ | |/
generated by cgit v1.1 at 2024-12-25 09:28:53 +0000