aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes (follow)
Commit message (Collapse)AuthorAgeFilesLines
* on presence close(), release animator and OnRegionHeartbeatEnd eventUbitUmarov2012-08-031-0/+7
|
* minor change avoiding a null referenceUbitUmarov2012-08-031-2/+4
|
* Make sure the position of a loggin-in agent is within region boundaries sinceMelanie2012-08-031-0/+9
| | | | out of bounds positions cause a rejection of the login.
* Merge branch 'master' into careminsterMelanie2012-08-011-0/+16
|\ | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Physics/Manager/PhysicsScene.cs
| * Create the ability for physics modules to request assets on demand byMelanie2012-08-011-0/+16
| | | | | | | | | | | | themselves. For that, the physics module simply calls RequestAssetMethod, which in turn points to Scene.PhysicsRequestAsset. This gives physics access to the asset system without introducing unwanted knowledge of the scene class.
* | Merge branch 'avination' into careminsterMelanie2012-08-012-4/+12
|\ \
| * \ Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkMelanie2012-07-311-1/+3
| |\ \
| | * | Correct StandUp position and rotationMelanie2012-07-301-1/+3
| | | |
| * | | Reverse a senseless change in the prioritizer. Why I would want avatars to ↵Melanie2012-07-311-3/+9
| |/ / | | | | | | | | | render according to their camera position is beyond me.
* | | Merge branch 'avination' into careminsterMelanie2012-07-291-0/+3
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | Fix an exception while outputting a log messageMelanie2012-07-291-1/+1
| | |
| * | See that if controls are taken, those are released before taking new onesMelanie2012-07-291-0/+3
| | |
* | | Fix some merge issues and a functional issue in the scene managerMelanie2012-07-281-1/+1
| | |
* | | Merge branch 'master' into careminsterMelanie2012-07-287-40/+144
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Monitoring/BaseStatsCollector.cs OpenSim/Region/Application/OpenSim.cs OpenSim/Region/Application/OpenSimBase.cs OpenSim/Region/Framework/Scenes/SceneManager.cs bin/OpenMetaverse.Rendering.Meshmerizer.dll bin/OpenMetaverse.StructuredData.dll bin/OpenMetaverse.dll bin/OpenMetaverseTypes.dll prebuild.xml
| * | Avoid a race condition between the scene shutdown thread and the update ↵Justin Clark-Casey (justincc)2012-07-271-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | thread since commit c150320 (Thu Jul 26 15:27:18 2012) c150320 started explicitly disposing of the physics scene and nulling it out on region shutdown. However, the update loop may not have yet checked Scene.ShuttingDown, particularly if avatars were not in the scene, causing failure when it tried to lookup time dilation. This commit moves the setting of m_shuttingDown above the existing 500ms pause to notify avatars that they are being kicked. This should not affect the few other places that use this flag.
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimRobert Adams2012-07-261-23/+46
| |\ \
| | * | When copying items, copy the item description field instead of the asset ↵Justin Clark-Casey (justincc)2012-07-261-23/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | description field. If we copy the asset description then we will only ever replicate the very first description, if there was one, not any subsequent changes. Thanks to Oren Hurvitz of Kitely for this patch from http://opensimulator.org/mantis/view.php?id=6107 I have adapted it slightly to change the order of arguments (name before description rather than vice-versa) and slightly improve some method doc.
| * | | Add a Dispose() of the physics engine when a scene is being shutdown.Robert Adams2012-07-261-0/+9
| |/ /
| * | Move Watchdog and MemoryWatchdog classes into OpenSim.Framework.Monitoring ↵Justin Clark-Casey (justincc)2012-07-251-0/+1
| | | | | | | | | | | | with other monitoring code from OpenSim.Framework
| * | Rename OpenSim.Framework.Statistics to OpenSim.Framework.Monitoring.Justin Clark-Casey (justincc)2012-07-252-2/+2
| | | | | | | | | | | | This better reflects the long-term purpose of that project and matches Monitoring modules.
| * | Make SceneManager.OnRegionsReadyStatusChange event available.Justin Clark-Casey (justincc)2012-07-254-10/+76
| | | | | | | | | | | | | | | This is fired when all regions are ready or when at least one region becomes not ready. Recently added EventManager.OnRegionReady becomes OnRegionReadyStatusChange to match OnLoginsEnabledStatusChange
| * | Change attachment handling to remove object from the scene first as perMelanie2012-07-232-11/+19
| | | | | | | | | | | | | | | | | | justincc's original work. Sample scripts before doing so. Also refactor some crucial common code and eliminate parameters that were only ever used with the same constant value.
| * | Committing Avination's memleak fix-a-thon, installment #3Melanie2012-07-231-0/+2
| | | | | | | | | | | | | | | | | | When linking, detach the no longer used SOG's from backup so they can be collected. Since their Children collection is never emptied, they prevent their former SOPs from being collected as well.
* | | Merge branch 'avination' into careminsterMelanie2012-07-232-11/+19
|\ \ \ | | |/ | |/|
| * | Change attachment handling to remove object from the scene first as perMelanie2012-07-232-11/+19
| | | | | | | | | | | | | | | | | | justincc's original work. Sample scripts before doing so. Also refactor some crucial common code and eliminate parameters that were only ever used with the same constant value.
* | | Merge branch 'master' into careminsterMelanie2012-07-205-158/+202
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | Stop explicitly closing and nulling out Animator in order to prevent NREs in ↵Justin Clark-Casey (justincc)2012-07-192-23/+7
| | | | | | | | | | | | | | | | | | | | | various places due to race conditions. Even where checks are being made they aren't enough since they all assume that the Animator they just checked is still there in the next line, which is not necessarily the case without locking. The memory used is small and these should be GC'd anyway when the SP is released. If this is not happening then the wider problem of old SPs being retained needs to be resolved.
| * | Prevent race conditions between two threads that call LLClientView.Close() ↵Justin Clark-Casey (justincc)2012-07-191-3/+3
| | | | | | | | | | | | simultaneously (e.g. ack timeout and an attempt to reconnect)
| * | Add TestCreateDuplicateRootScenePresence() regression test.Justin Clark-Casey (justincc)2012-07-193-1/+41
| | |
| * | Add basic TestCreateRootScenePresence() regression testJustin Clark-Casey (justincc)2012-07-191-135/+144
| | |
* | | Merge branch 'master' into careminsterMelanie2012-07-196-44/+105
|\ \ \ | |/ / | | / | |/ |/| | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * Add EventManager.OnRegionLoginsStatusChange fired whenever logins are ↵Justin Clark-Casey (justincc)2012-07-194-16/+35
| | | | | | | | | | | | | | enabled or disabled at any point, not just during initial startup. This replaces EventManager.OnLoginsEnabled which only fired when logins were first enabled and was affected by a bug where it would never fire if the region started with logins disabled.
| * Add back notification to neighbouring regions when RegionReadyModule is not ↵Justin Clark-Casey (justincc)2012-07-181-0/+3
| | | | | | | | active accidentally just removed in 528004d
| * Perform other region ready actions even if simulator is configured to leave ↵Justin Clark-Casey (justincc)2012-07-182-20/+19
| | | | | | | | logins disabled on startup.
| * Fix bug where region ready was being triggered twice in quick succession if ↵Justin Clark-Casey (justincc)2012-07-181-9/+12
| | | | | | | | a region contained no scripts.
| * Establish EventManager.OnRegionReady event. This will only be triggerred ↵Justin Clark-Casey (justincc)2012-07-182-3/+35
| | | | | | | | | | | | once when the region is ready. Switch MapImageServiceModule to use this.
| * Pass entire scene object in OnLoginsEnabled event rather than just the ↵Justin Clark-Casey (justincc)2012-07-182-5/+4
| | | | | | | | | | | | region name. This saves listeners from having to re-retrieve the scene from their own lists, which won't work anyway if multiple regions with the same name have been allowed
| * Merge branch 'master' of git://opensimulator.org/git/opensimDan Lake2012-07-182-24/+16
| |\
| | * Close() the ScenePresence after we've removed it from the scene graph, to ↵Justin Clark-Casey (justincc)2012-07-181-10/+16
| | | | | | | | | | | | cut down race conditions when another thread manages the grab the presence after some SP structures have been reset.
| * | Missing parameter in log error message was throwing exceptionDan Lake2012-07-181-1/+1
| | |
* | | Merge branch 'ubitwork' into avinationMelanie2012-07-174-51/+70
|\ \ \
| * | | minor changes, removed extra parts physics updates on linking nonrootUbitUmarov2012-07-171-2/+3
| | | | | | | | | | | | | | | | prims
| * | | fix our stats ( old schema )UbitUmarov2012-07-172-48/+66
| | | |
| * | | Merge branch 'avination' into ubitworkUbitUmarov2012-07-173-10/+4
| |\ \ \
| * \ \ \ Merge branch 'avination' into ubitworkUbitUmarov2012-07-171-14/+0
| |\ \ \ \
| * \ \ \ \ Merge branch 'avination' into ubitworkUbitUmarov2012-07-1740-1280/+2632
| |\ \ \ \ \
| * | | | | | remove forgotten line...UbitUmarov2012-07-141-1/+0
| | | | | | |
| * | | | | | don't subscribe collision events for nonphysical parts only because ofUbitUmarov2012-07-142-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | collision sounds. Let them be passive
* | | | | | | Replace PollServiceRequestManager with older version, add extra logging toMelanie2012-07-171-0/+1
| |_|_|/ / / |/| | | | | | | | | | | | | | | | | event exceptions to see call path leading up to it.
* | | | | | Fix merge artefactsMelanie2012-07-173-10/+4
| |_|/ / / |/| | | |
generated by cgit v1.1 at 2024-12-30 12:46:24 +0000