aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'avination' into careminsterMelanie2013-03-231-2/+15
|\ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
| * Make sharing errors not spew and let the cache retry the filesMelanie Thielker2013-03-231-1/+15
| |
* | Merge branch 'master' into careminsterMelanie2013-03-222-10/+67
|\ \
| * | Take out a testing sleep I accidentally left in the teleport code from last ↵Justin Clark-Casey (justincc)2013-03-221-2/+0
| | | | | | | | | | | | commit 7471bc7
| * | At strategic points in the teleport process, if the client has ↵Justin Clark-Casey (justincc)2013-03-222-10/+69
| | | | | | | | | | | | | | | | | | | | | simultaneously logged out then do not continue. This aims to reduce any side effects if the process tries to complete after the client has logged back in (e.g. it was delayed due to a slow destination region response). This introduces a new Aborting entity transfer state which signals that the teleport should be stopped but no compensating actions performed.
* | | Merge branch 'master' into careminsterMelanie2013-03-227-29/+56
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
| * | Implement chat across region borders since we can tell if avatars in ↵Justin Clark-Casey (justincc)2013-03-221-1/+1
| | | | | | | | | | | | neighbouring regions are in range.
| * | minor: On teleport, signal a child agent before we send the viewer ↵Justin Clark-Casey (justincc)2013-03-211-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | TeleportFinish in order to avoid a theoretical race condition when teleporting to a neighbour. If we do this after TeleportFinish, then it's possible for a neighbour destination to request the source to create a child agent whilst its still treated as root. This closes the original presence which we don't really want to do. This is probably okay (albeit with warnings on the console) but afaics there's no reason not to move the child agent signal.
| * | On a teleport, lock m_agentsInTransit whilst we grab the value to check for ↵Justin Clark-Casey (justincc)2013-03-211-1/+8
| | | | | | | | | | | | completion just to be sure we're not using a thread cached version.
| * | On the later forms of teleport failure, tell the user if this was because ↵Justin Clark-Casey (justincc)2013-03-202-17/+29
| | | | | | | | | | | | | | | | | | | | | viewer couldn't/didn't connect with destination or if destination didn't signal teleport completion. Also adds regression test for the case where the viewer couldn't connect with the destination region. Also refactoring of regression test support code associated with entity transfer in order to make this test possible and the code less obscure.
| * | Prevent multiple instances of the same item ID being appended to an ↵Justin Clark-Casey (justincc)2013-03-192-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | AvatarAppearance It looks like this was happening when AttachmentsModule.RezAttachments was doing a secondary set of each attachment to update with the asset ID (initially they only have the inventory ID). However, with multi-attach this was appending a second copy of the same attachment rather than updating the data that was already there. This commit requires both simulator and service to be updated.
| * | For those people collecting and comparing logfiles from servers scatteredRobert Adams2013-03-191-1/+1
| | | | | | | | | | | | | | | around the world, change LogWriter to use DateTime.UtcNow rather than DateTime.Now.
| * | Process default attachment point in AttachObjectInternal before we check ↵Justin Clark-Casey (justincc)2013-03-191-27/+27
| | | | | | | | | | | | whether a worn object needs to displace an existing attachment on the same point if we are not using multi-attach.
| * | Fix tests for multiattachMelanie2013-03-182-6/+6
| | |
| * | Merge branch 'master' into newmultiattachMelanie2013-03-1810-131/+655
| |\ \ | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
| * \ \ Merge commit 'ccd6f443e1092cb410f565e921f7cf4dd8cd2dac' into newmultiattachMelanie2013-03-181-139/+167
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
| * | | | Limit each attachment point to 5 items as per specMelanie2013-03-181-3/+13
| | | | |
| * | | | Multiattach, part 1Melanie2013-03-182-33/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/AvatarAppearance.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
* | | | | Fix merge artefactsMelanie2013-03-192-6/+6
| | | | |
* | | | | Merge commit '3611d33b00650ccc71994b331e4c6595f95d3131' into careminsterMelanie2013-03-192-143/+351
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
| * | | | Improve rejection of any attempt to reattach an object that is already attached.Justin Clark-Casey (justincc)2013-03-182-31/+194
| | | | | | | | | | | | | | | | | | | | This also adds/extends regression tests for wearing attachments directly for the scene and attempting to reattach/rewear already attached objects.
| * | | | Fix recent regression where an item worn to an attachment point that was ↵Justin Clark-Casey (justincc)2013-03-182-89/+153
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | already occupied did not remove the previous attachment (current behaviour) Regression was commit ccd6f4 (Tue Mar 5 23:47:36 2013) Added regression test for this case.
* | | | | Merge branch 'master' into careminsterMelanie2013-03-153-5/+36
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/BaseOpenSimServer.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | | | Add example code to DOExampleModule to pull data from that previously saved ↵Justin Clark-Casey (justincc)2013-03-152-5/+29
| | | | | | | | | | | | | | | | | | | | by DAExampleModule when instantiating a dynamc object.
| * | | | Add ParentGroup.HasGroupChanged = true setting to DAExampleModule as this is ↵Justin Clark-Casey (justincc)2013-03-151-0/+2
| | | | | | | | | | | | | | | | | | | | necessary to get attributes to save (though this probably happens anyway due to the prim move)
| * | | | Add ILandChannel.GetLandObject(Vector3 position) as this is a very common ↵Justin Clark-Casey (justincc)2013-03-141-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | input to GetLandObject() This conforms to the existing ILandChannel.ParcelsNearPoint() method
* | | | | Merge branch 'master' into careminsterMelanie2013-03-142-8/+133
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
| * | | | Improve DAExampleModule to show current necessary locking to avoid race ↵Justin Clark-Casey (justincc)2013-03-131-8/+16
| | | | | | | | | | | | | | | | | | | | conditions with a serialization thread.
| * | | | Add prototype dynamic objects map for scene object partsJustin Clark-Casey (justincc)2013-03-131-0/+117
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows region modules to add dynamic objects to SOPs rather than having to continually push and pull OSD dynamic attributes. This is to explore the original MOAP use case for dynamic attributes where it could be very awkward and possibly time-consuming to keep reconstructing MediaEntrys from stored DynamicAttributes. This commit adds a DOExampleModule to demonstrate/evolve this code. Dynamic objects involve no storage or persistence changes - the 'backing store' for any data that does need to be saved will remain the DAMap. DOExampleModule in this commit only attaches a fresh dynamic object. Actually constructing this from stored dynamic attributes and handling persistence is left for later. These changes should affect no existing functionality, though it may or may not reveal necessary changes in DAMap down the road.
* | | | | Merge branch 'master' into careminsterMelanie2013-03-133-34/+173
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Tests/SceneObjectUndoRedoTests.cs
| * | | | minor: save some commented out log lines which will be useful again in ↵Justin Clark-Casey (justincc)2013-03-131-0/+5
| | | | | | | | | | | | | | | | | | | | future debugging of VectorRenderModule
| * | | | Add DisableInterRegionTeleportCancellation option in [EntityTransfer] ↵Justin Clark-Casey (justincc)2013-03-121-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | section of OpenSim.ini. False by default. This option allows the simulator to specify that the cancel button on inter-region teleports should never appear. This exists because sometimes cancellation will result in a stuck avatar requiring relog. It may be hard to prevent this due to the protocol design (the LL grid has the same issue) In small controlled grids where teleport failure is practically impossible it can be better to disable teleport cancellation entirely.
| * | | | Improve teleport cancellation in some circumstances, though cancelling ↵Justin Clark-Casey (justincc)2013-03-122-34/+149
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | teleports is still not recommended. Previously, hitting the cancel button on a teleport would cancel on the client side but the request was ignored on the server side. Cancel would still work if the teleport failed in the early stages (e.g. because the destination never replied to early CreateAgent and UpdateAgent messages). But if the teleport still completed after a delay here or later on, the viewer would become confused (usual symptom appears to be avatar being unable to move/reteleport). This commit makes OpenSimulator obey cancellations which are received before it sends the TeleportFinish event queue message and does proper cleanup. But cancellations received after this (which can happen even though the cancel button is removed as this messages comes on a different thread) can still result in a frozen avatar. This looks extremely difficult and impossible to fix. I can replicate the same problem on the Linden Lab grid by hitting cancel immediately after a teleport starts (a teleport which would otherwise quickly succeed).
* | | | | Merge branch 'master' into careminsterMelanie2013-03-083-5/+10
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
| * | | | minor: remove some completely unused string local vars added recently in ↵Justin Clark-Casey (justincc)2013-03-061-2/+0
| | | | | | | | | | | | | | | | | | | | commit 984faf2
| * | | | Add code for testing event queue messages recevied on region cross.Justin Clark-Casey (justincc)2013-03-062-3/+11
| | | | | | | | | | | | | | | | | | | | This is currently disabled pending an improvement in the test code to properly add avatars when an event queue module is present.
* | | | | Merge branch 'avination' into careminsterMelanie2013-03-063-30/+40
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
| * | | | Limit each attachment point to 5 items as per specMelanie2013-03-051-3/+13
| | | | |
| * | | | Multiattach, part 1Melanie2013-03-052-30/+20
| | | | |
| * | | | Experimental - add void return support to modSendCommandMelanie2013-03-031-0/+2
| | | | |
* | | | | Merge branch 'master' into careminsterMelanie2013-03-052-146/+165
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/MeshUploadFlagModule.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
| * | | | minor: Fix mono compiler warning in MonitorModuleJustin Clark-Casey (justincc)2013-03-051-2/+0
| | |_|/ | |/| |
| * | | Get attachment script state before taking sp.AttachmentsSyncLock() to avoid ↵Justin Clark-Casey (justincc)2013-03-051-140/+161
| | |/ | |/| | | | | | | | | | | | | race conditions between closing agents and scripts that may be doing attachment manipulation. This is in an effort to resolve http://opensimulator.org/mantis/view.php?id=6557
* | | Merge branch 'avination' into careminsterMelanie2013-03-034-26/+42
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
| * | Reinstate uploading temporary texturesMelanie2013-02-271-4/+4
| | |
| * | Try to update inventory items when there is a valid asset - may fix temp ↵Melanie2013-02-271-0/+5
| | | | | | | | | | | | textures
| * | Revert "Allow TeleportCancel packets to reset the transfer state machine"Melanie2013-02-241-6/+0
| | | | | | | | | | | | This reverts commit 0e17887e03fb6d32cdd07838caa56e34103ae8f2.
| * | Fix an issue where the viewer would request the seed cap beforeMelanie2013-02-181-15/+26
| | | | | | | | | | | | there was a handler for it.
| * | Correctly remove https:// URLs from the http server.Melanie2013-02-171-1/+7
| | |
* | | Merge branch 'master' into careminsterMelanie2013-03-011-21/+33
|\ \ \ | | |/ | |/|
generated by cgit v1.1 at 2025-03-10 14:12:54 +0000