aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-06-262-83/+111
|\ | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * When attachments are being saved and deleted for a closing root agent, ↵Justin Clark-Casey (justincc)2012-06-251-12/+21
| | | | | | | | | | | | delete first to avoid a hud race condition with update threads. If delete doesn't occur first then the update thread can outrace the IsAttachment = false necessary to save attachments and send hud artifacts to other viewers.
| * In AttachmentsModule.DetachSingleAttachmentToInvInternal(), remove ↵Justin Clark-Casey (justincc)2012-06-251-1/+1
| | | | | | | | | | | | | | | | | | attachment before changing properties for correct inventory serialization. Serialization of attachments requires IsAttachment = false so that correct positions are serialized instead of avatar position. However, doing this when a hud is still attached allows race conditions with update threads, resulting in hud artifacts on other viewers. This change sets SOG.IsDeleted before serialization changes take place (IsDeleted itself is not a serialized property). LLClientView then screens out any deleted SOGs before sending updates to viewers.
| * Resolve various race conditions between accessing and removing external ↵Justin Clark-Casey (justincc)2012-06-221-132/+148
| | | | | | | | script URLs by more consistently locking on m_UrlMap
| * Avoid a race condition where an incoming request to a script external URL ↵Justin Clark-Casey (justincc)2012-06-221-35/+73
| | | | | | | | | | | | | | | | | | | | | | can trigger an exception is the URL was being removed at the same time. This involves three steps 1) Return gracefully in UrlModule.HttpRequestHandler() instead of throwing an exception when the url cannot be found in its index 2) Return true instead of false in HasEvents() if no matching request is found in the map. This call will only happen in the first place for raced requests. 3) Return a 404 in GetEvents() if the request is not in the index, rather than a blank 200 OK. Many thanks to Tom Haines in http://opensimulator.org/mantis/view.php?id=6051 for doing some of the work on this.
| * Stop flicking IsAttachment false and then true in ↵Justin Clark-Casey (justincc)2012-06-221-10/+0
| | | | | | | | | | | | | | | | AttachmentsModule.UpdateAttachmentPosition() in order to avoid a hud update race condition. Previously, setting IsAttachment to false then true was necessary to serialize the updated attachment object information. However, UpdateAttachmentPosition no longer does this update. Whilst IsAttachment is set to false there is a race condition where the update thread can wrongly send hud object updates to clients that do not own the hud, resulting in screen artifacts.
| * refactor AttachmentsModule tests to use a common method for standard ↵Justin Clark-Casey (justincc)2012-06-221-70/+69
| | | | | | | | attachment item setup
| * Add regression test for updating attachment positionJustin Clark-Casey (justincc)2012-06-221-0/+30
| |
* | Merge branch 'master' into careminsterMelanie2012-06-215-6/+13
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * Lower warn logging on not having friends/group module on permissions to debug.Justin Clark-Casey (justincc)2012-06-201-2/+2
| | | | | | | | It's a valid configuration not to have these modules, but I think it's still worth logging the fact that certain permissions won't work (always return true)
| * minor: Lower flotsam asset cache warning about not having a FlotsamCache.ini ↵Justin Clark-Casey (justincc)2012-06-201-1/+1
| | | | | | | | | | | | to debug It's perfectly okay not to have this section.
| * Comment out the neighbour and land in connectors from info logging that they ↵Justin Clark-Casey (justincc)2012-06-202-2/+2
| | | | | | | | are starting up
| * Change read config paramter from max_urls_per_simulator to ↵Justin Clark-Casey (justincc)2012-06-161-1/+1
| | | | | | | | max_external_urls_per_simulator, which is what it was meant to be
| * Implement max_external_urls_per_simulator setting in [LL-Functions] to allow ↵Justin Clark-Casey (justincc)2012-06-161-1/+8
| | | | | | | | | | | | | | configuration of how many urls can be set up by llRequestURL() Defaults remains as 100. This setting is per simulator instead of per region due to how the url script module is structured.
* | Merge branch 'master' into careminsterMelanie2012-06-151-1/+1
|\ \ | |/
| * Put all debug console commands into a single Debug section rather than ↵Justin Clark-Casey (justincc)2012-06-151-1/+1
| | | | | | | | scattering them over other categories
* | Merge branch 'master' into careminsterMelanie2012-06-151-4/+5
|\ \ | |/
| * Make XMLRPCModule use an existing HTTP server if one already exists on the ↵Justin Clark-Casey (justincc)2012-06-151-4/+5
| | | | | | | | desired port.
* | Merge branch 'master' into careminsterMelanie2012-06-151-0/+14
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
| * correct wrong incomplete comment from previous commit 3c3ea19 in ↵Justin Clark-Casey (justincc)2012-06-141-1/+2
| | | | | | | | AttachmentsModule
| * Fix a bug where scene objects attached as HUDs through scripts would not ↵Justin Clark-Casey (justincc)2012-06-141-0/+13
| | | | | | | | | | | | disappear for other avatars. We do this by sending a kill message for that object to all other avatars apart from the one that has the hud.
* | Merge branch 'master' into careminsterMelanie2012-06-141-5/+2
|\ \ | |/
| * Add SOG.HasPrivateAttachmentPoint to tell if a SOG has a private attachment ↵Justin Clark-Casey (justincc)2012-06-141-5/+2
| | | | | | | | | | | | | | | | point. HUDs attachment points are private. Change SOP.SendFullUpdateToClient() and SoundModule.PlayAttachedSound() to use this rather than different magic number formulations. This also corrects a bug in PlayAttachedSound() where the code assumed that all attachment points over 30 were HUDs. It appears this is no longer true with Neck and Root (Avatar Center)
* | Merge branch 'master' into careminsterMelanie2012-06-123-59/+28
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
| * OnConnectionClosed listeners, retrieve data from IClientAPI.SceneAgent ↵Justin Clark-Casey (justincc)2012-06-123-48/+28
| | | | | | | | | | | | | | rather than scanning all scene for the presence with the right id Stop checking IsLoggingOut on these listeners, if called with a root agent then we always want to perform these actions. This covers cases where the client is closed due to manual kick, simulator shutdown, etc.
| * In PresenceDetector.OnConnectionClose(), use the IsChildAgent check already ↵Justin Clark-Casey (justincc)2012-06-121-12/+1
| | | | | | | | available on IClientAPI.SceneAgent rather than retrieving it again by scanning all scenes.
* | Merge branch 'master' into careminsterMelanie2012-06-111-0/+8
|\ \ | |/
| * Add last frame time monitor to MonitorModule now that this value is usefulJustin Clark-Casey (justincc)2012-06-111-0/+8
| |
* | Merge branch 'master' into careminsterMelanie2012-06-081-1/+0
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * Don't make duplicate call to ScenePresence.Close() separately in ↵Justin Clark-Casey (justincc)2012-06-081-1/+0
| | | | | | | | | | | | | | ETM.DoTeleport() if an agent needs closing. This is always done as part of Scene.RemoveClient() Also refactors try/catching in Scene.RemoveClient() to log NREs instead of silently discarding, since these are useful symptoms of problems.
* | Merge branch 'master' into careminsterMelanie2012-06-081-1/+1
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
* | Merge branch 'avination' into careminsterMelanie2012-06-074-33/+94
|\ \
| * | Make the "delay restart" button delay restart for 1 hour rather than abortingMelanie2012-06-072-31/+60
| | | | | | | | | | | | it altogether. Allow a maximum of three uses before the restart goes through.
| * | Make timed bans / timed passes work as expected. Prevent transmission of mediaMelanie2012-06-072-2/+34
| | | | | | | | | | | | URLs to banned clients.
* | | Merge branch 'master' into careminsterMelanie2012-06-072-9/+8
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
| * | Record the fact that child agents can have asset transactions.Justin Clark-Casey (justincc)2012-06-072-9/+8
| | | | | | | | | | | | Also change code to grab the agent asset transaction module once.
* | | Reverse the logic of a conditional. Clears up a merge artefact.Melanie2012-06-061-1/+1
| | |
* | | Merge branch 'avination' into careminsterMelanie2012-06-062-13/+31
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | Fix llAttachToAvatar and "Attach" viewer option to preserve saved attach ↵Melanie2012-06-042-6/+24
| | | | | | | | | | | | positions.
* | | Merge branch 'master' into careminsterMelanie2012-06-066-231/+266
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
| * | minor: Change log messages on Warp3DImageModule to show they are from this ↵Justin Clark-Casey (justincc)2012-06-061-7/+9
| | | | | | | | | | | | module
| * | Rename MapImageModule for Warp3D to Warp3DImageModule to match its class ↵Justin Clark-Casey (justincc)2012-06-061-0/+0
| | | | | | | | | | | | name and make it easier to distinguish between map image modules.
| * | Actively dispose of Bitmaps in Warp3D image module and world map module once ↵Justin Clark-Casey (justincc)2012-06-063-215/+248
| | | | | | | | | | | | | | | | | | we've finished with them. This might help with memory leakage issues though I suspect it won't.
| * | enabling all corners of a sim to be set in one callSignpostMarv2012-06-061-1/+11
| | |
| * | Stop accidentally reading 4 Int16s instead of 2 in SIZE section of Terragen ↵Justin Clark-Casey (justincc)2012-06-051-2/+0
| | | | | | | | | | | | | | | | | | | | | file when loaded from a stream. Fixes a bug introduced 2 weeks ago in 67ebe80 Thanks to Plugh for pointing this out.
| * | Remove the "Profile" config as it's covered by the replaceable interfaceMelanie2012-06-041-8/+0
| | |
* | | Merge branch 'avination' into careminsterMelanie2012-05-311-24/+27
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | Fix the log standing attach-from-world bug.Melanie2012-05-301-24/+27
| | |
* | | Merge branch 'master' into careminsterMelanie2012-05-312-44/+253
|\ \ \ | | |/ | |/|
| * | Add an optional mechanism for physics modules to collect and return ↵Justin Clark-Casey (justincc)2012-05-311-44/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | arbitrary stats. If active, the physics module can return arbitrary stat counters that can be seen via the MonitoringModule (http://opensimulator.org/wiki/Monitoring_Module) This is only active in OdeScene if collect_stats = true in [ODEPhysicsSettings]. This patch allows OdeScene to collect elapsed time information for calls to the ODE native collision methods to assess what proportion of time this takes compared to total physics processing. This data is returned as ODENativeCollisionFrameMS in the monitoring module, updated every 3 seconds. The performance effect of collecting stats is probably extremely minor, dwarfed by the rest of the physics code.
generated by cgit v1.1 at 2025-03-07 07:12:55 +0000