aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-06-292-53/+46
|\ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * Change AttachmentsModule.DetachSingleAttachmentToInv() to accept a SOG ↵Justin Clark-Casey (justincc)2012-06-282-40/+45
| | | | | | | | | | | | | | directly instead of an item ID to then shuffle through attachments, saving CPU busywork. Almost all callers already had the sog to hand. Still checking that it's really an attachment, but now by inspecting SOG.AttachedAvatar
| * Rather than iterating through all SOGs in the scene looking for the one that ↵Justin Clark-Casey (justincc)2012-06-281-24/+17
| | | | | | | | matches out fromItemID on detach, go through the agent's attachment sog list instead.
| * Remove code that tried to delete an attachment back to inventory if ↵Justin Clark-Casey (justincc)2012-06-281-6/+1
| | | | | | | | | | | | | | RezSingleAttachmentFromInventoryInternal() returned null. null would only ever be returned if the item couldn't be located within inventory and this would happen immediately. In this case, derezzing wouldn't work anyway since there is no item to derez.
* | Merge branch 'avination' into careminsterMelanie2012-06-291-2/+9
|\ \ | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs
| * | Fix llRegionSayTo the right wayMelanie2012-06-281-2/+9
| | |
* | | Revert "Mantis 5977 Corrections to llRegionSayTo"Melanie2012-06-281-34/+16
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 679da63da617d031e5e7ae3f2d2a29db1a23ace3. Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
* | | Merge branch 'master' into careminsterMelanie2012-06-284-80/+212
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
| * | Fix issue in InventoryArchiveTestCase where it didn't call down to ↵Justin Clark-Casey (justincc)2012-06-271-1/+2
| | | | | | | | | | | | OpenSimTestCase.SetUp()
| * | refactor: Move ScenePresence <-> AgentData attachments copying code into ↵Justin Clark-Casey (justincc)2012-06-271-0/+50
| | | | | | | | | | | | AttachmentsModule.
| * | Automatically disable log4net before each regression test so that logging is ↵Justin Clark-Casey (justincc)2012-06-272-4/+2
| | | | | | | | | | | | | | | | | | | | | confined to a single test if it's turned on. This involves making test classes inherit from a common OpenSimTestCase. This will be applied to more classes as required.
| * | refactor: Remove unnecessary AttachmentModuleTests.m_userId in favour of ↵Justin Clark-Casey (justincc)2012-06-261-40/+26
| | | | | | | | | | | | local variables
| * | refactor: Use local attachment module variables instead of global m_attMod.Justin Clark-Casey (justincc)2012-06-261-11/+10
| | | | | | | | | | | | This also avoids confusion between tests where one sets up m_attMod and another accidentally uses it after failing to set one up itself.
| * | refactor: make m_presence a local variable in all AttachmentsModuleTests ↵Justin Clark-Casey (justincc)2012-06-261-26/+25
| | | | | | | | | | | | since it doesn't need to be global and some tests set up more than one sp
| * | Add regression test to check that attachments in source region are deleting ↵Justin Clark-Casey (justincc)2012-06-261-18/+115
| | | | | | | | | | | | when an agent teleports to a neighbouring region
| * | minor: update currently commented out log message at top of ↵Justin Clark-Casey (justincc)2012-06-251-1/+3
| | | | | | | | | | | | AvatarFactoryModule.SetAppearance() for future use
* | | 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.
| * | 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-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 '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-061-8/+0
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
| * | 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-311-0/+189
|\ \ \ | | |/ | |/|
| * | Add console command "teleport user" to allow teleport from the region consoleJustin Clark-Casey (justincc)2012-05-291-0/+189
| | | | | | | | | | | | See "help teleport user" on the console for more details
* | | Merge branch 'master' into careminsterMelanie2012-05-273-83/+91
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Data/MySQL/Resources/RegionStore.migrations OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
| * | Resolve some mono compiler warnings.Justin Clark-Casey (justincc)2012-05-252-6/+9
| | |
| * | Fetch the dialog module reference in AttachmentsModule in RegionLoaded() not ↵Justin Clark-Casey (justincc)2012-05-231-1/+1
| | | | | | | | | | | | | | | | | | AddRegion() The reference is not guaranteed to be there when AddRegion() is called but will definitely be present at RegionLoaded() if it's going to be present at all.
| * | Fix bug where an avatar that had an object they owned attached through ↵Justin Clark-Casey (justincc)2012-05-232-137/+82
| | | | | | | | | | | | | | | | | | | | | llAttachToAvatar() or osForceAttachToAvatar() would wrongly have next permissions come into play when they detached that object and rezzed it in scene. This is because the attachments module code was setting the 'object slam' bit by using PermissionMask.All Solution here is to route the attachment item creation call through the existing inventory code in BasicInventoryAccessModule rather than copy/pasted code in AttachmentsModule itself.
* | | Merge branch 'master' into careminsterMelanie2012-05-141-0/+10
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | minor: add explanative comment to 'missing baked texture' logging commonly ↵Justin Clark-Casey (justincc)2012-05-141-0/+10
| | | | | | | | | | | | seen on inter-simulator teleports where avatar baked textures are not available from the asset service.
* | | Merge branch 'master' into careminsterMelanie2012-05-081-20/+9
|\ \ \ | |/ /
| * | refactor: Instead of performing a ScenePresence lookup twice over ↵Justin Clark-Casey (justincc)2012-05-071-18/+2
| | | | | | | | | | | | LocateClientObject() and GetClientScene(), do the lookup just once in LocateClientObject()
| * | Fix a bug in FriendsModule.StatusNotify() where all subsequent friends would ↵Justin Clark-Casey (justincc)2012-05-071-2/+7
| | | | | | | | | | | | not be notified once a non-local friend was found.
* | | Merge branch 'master' into careminsterMelanie2012-05-052-12/+23
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/WebUtil.cs OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | Fire the scripting changed event with CHANGED_OWNER when an object that has ↵Justin Clark-Casey (justincc)2012-05-051-9/+9
| | | | | | | | | | | | | | | | | | | | | changed owners is rezzed. This needs to occur after the script is resumed rather than before, when the event is just dropped. Addresses http://opensimulator.org/mantis/view.php?id=5890 and http://opensimulator.org/mantis/view.php?id=5952
| * | Mantis 60004 problems with damage and llSetDamage. In damage enabled areas ↵Talun2012-05-041-3/+14
| | | | | | | | | | | | this patch - Deletes any objects that have damage set > 0 that deliver that damage to an avatar Stops Gods receiving damage, Stops volume detect objects causing damage Deletes NPCS when their helth reduces to zero Gradually "heals" damage to an avatar Resets health on going to a non damage area
* | | Merge branch 'master' into careminsterMelanie2012-05-021-4/+6
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
| * | refactor: Split most of EntityTransferModule.Teleport() into its same region ↵Justin Clark-Casey (justincc)2012-05-011-4/+6
| | | | | | | | | | | | | | | | | | and different region teleport components. DoTeleport() now retrives IEventQueue itself rather than requiring it to be passed in.
* | | Merge branch 'master' into careminsterMelanie2012-04-271-1/+4
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
| * | Use DotNetZip to compress OARs and IARs.Oren Hurvitz2012-04-271-1/+4
| | | | | | | | | | | | DotNetZip provides much better compression than standard .NET.
* | | Merge branch 'master' into careminsterMelanie2012-04-276-13/+13
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/Scene.cs
generated by cgit v1.1 at 2024-12-23 15:14:00 +0000