aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-05-164-12/+11
|\ | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
| * On closing child agents, send separate asynchronous requests to each ↵Justin Clark-Casey (justincc)2013-05-163-9/+5
| | | | | | | | | | | | | | neighbour rather than sending all closes concurrently on a separate thread. This is to reduce race conditions where neighbours may be responding erratically, thus mixing up create and close agent requests in time. This mirrors OpenSimulator behaviour on enabling child agents where each region is contacted separately.
| * On logout, send close child agent requests to neighbours asynchronously, so ↵Justin Clark-Casey (justincc)2013-05-161-6/+3
| | | | | | | | | | | | user is not prevented from relogging if many neighbours are present but not responsive. The symptom here is that previous user connections are still present but are labelled active == false
| * Eliminate race condition where SimStatsReporter starts reportingRobert Adams2013-05-141-0/+3
| | | | | | | | stats before the region is completely initialized.
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-05-141-0/+1
| |\
| | * Second take at HGTP-mesh bug: delay sending the initial data only for agents ↵Diva Canto2013-05-141-0/+1
| | | | | | | | | | | | that are coming via TP (root agents)
| * | Comment out some debugging item permission messages since these are highly ↵Justin Clark-Casey (justincc)2013-05-141-3/+3
| |/ | | | | | | | | | | noisy on the console. Please re-enable when required
| * Revert "HGTP-mesh bug: the mesh download requests were going to the ↵Diva Canto2013-05-141-3/+0
| | | | | | | | | | | | departing sims for a little while. This was also true for local TPs. BUt for local TPs the assets are on the same server, so it doesn't matter. For HGTPs, it matters. This potential fix moves sending the initial data to later, after the client has completed the movement into the region. Fingers crossed that it doesn't mess other things up!" This reverts commit f32a21d96707f87ecbdaf42c0059f8494a119d31.
| * HGTP-mesh bug: the mesh download requests were going to the departing sims ↵Diva Canto2013-05-141-0/+3
| | | | | | | | for a little while. This was also true for local TPs. BUt for local TPs the assets are on the same server, so it doesn't matter. For HGTPs, it matters. This potential fix moves sending the initial data to later, after the client has completed the movement into the region. Fingers crossed that it doesn't mess other things up!
* | Merge branch 'master' into careminsterMelanie2013-05-121-29/+0
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * Finalize the logic for SetHome. See comments in Land/LandManagementModule.cs ↵Diva Canto2013-05-111-19/+0
| | | | | | | | about who has permission to set home where.
* | Merge branch 'master' into careminsterMelanie2013-05-117-49/+112
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Services/LLLoginService/LLLoginResponse.cs OpenSim/Services/LLLoginService/LLLoginService.cs OpenSim/Tests/Common/Mock/TestClient.cs
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2013-05-117-47/+112
| |\
| | * Don't send BulkUpdateInventory at the end up of UpdateInventoryItemAsset().Justin Clark-Casey (justincc)2013-05-091-1/+4
| | | | | | | | | | | | | | | This is causing editing of worn clothes to fail frequently, possibly due to a race condition with a transaction. This looks to address http://opensimulator.org/mantis/view.php?id=6600
| | * Only send one kill object to the deleter when they derez an object rather ↵Justin Clark-Casey (justincc)2013-05-092-17/+12
| | | | | | | | | | | | | | | | | | than two. Extend regression test to check this.
| | * remove pointless region handle paramter from IClientAPI.SendKillObject()Justin Clark-Casey (justincc)2013-05-092-3/+4
| | |
| | * Fix issue where objects removed via llDie() would not disappear for users ↵Justin Clark-Casey (justincc)2013-05-094-19/+91
| | | | | | | | | | | | | | | | | | | | | | | | looking in from neighbouring sims. This was because this particular code path (unlike user delete) only sent kills to root presences, for no apparent good reason. Added regression test for this case. This fixes http://opensimulator.org/mantis/view.php?id=6627
| | * minor: Simplify test setup in SceneObjectDeRezTests since permissions module ↵Justin Clark-Casey (justincc)2013-05-091-10/+4
| | | | | | | | | | | | doesn't need different configuration anymore
| * | Send up the part missing from the Avination Estate commit.Melanie2013-05-111-2/+0
| |/ | | | | | | Warning - contains a small migration.
* | Merge branch 'master' into careminsterMelanie2013-05-081-1/+1
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
| * Step one of estate settings sharing - port the Avination Estate module ↵Melanie2013-05-071-2/+3
| | | | | | | | (complete module) as changes are too extensive to apply manually
* | Merge branch 'master' into careminsterMelanie2013-05-061-5/+18
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-05-062-9/+106
| |\
| * | Minor reordering of operations on NewUserConnection. The agent circuit needs ↵Diva Canto2013-05-061-5/+17
| | | | | | | | | | | | to be added earlier for some of the checks to work correctly.
* | | Merge branch 'master' into careminsterMelanie2013-05-042-2/+18
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Conflicts: OpenSim/Region/Application/OpenSimBase.cs OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
| * | On startup, start scenes after we're set up all local scenes, rather than ↵Justin Clark-Casey (justincc)2013-05-032-2/+18
| | | | | | | | | | | | | | | | | | | | | starting scenes before others have been created. This aims to avoid a race condition where scenes could look to inform neighbours that they were up before those neighbours had been created. http://opensimulator.org/mantis/view.php?id=6618
| * | Some more pieces of Avination's ban system - if an avatar isn't allowed on anyMelanie2013-04-291-7/+88
| |/ | | | | | | parcel in the sim, keep them out entirely.
* | Merge branch 'master' into careminsterMelanie2013-04-251-0/+66
|\ \ | |/
| * UUIDGatherer now includes UUIDs which reference texture assets used as materialsdahlia2013-04-241-0/+66
| |
| * Add Avination's support for parcel eject and freezeMelanie2013-04-251-15/+25
| |
* | Merge branch 'master' into careminsterMelanie2013-04-211-9/+35
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs bin/OpenMetaverse.StructuredData.XML bin/OpenMetaverse.XML bin/OpenMetaverseTypes.XML
| * Materials-capable viewers send ImageUpdate packets when updating materials ↵dahlia2013-04-191-11/+35
| | | | | | | | that are normally sent via RenderMaterials CAP. This can cause a race condition for updating TextureEntry fields. Therefore filter any TextureEntry updates so they only update if something actually changed.
| * Allow changes to TextureEntry to propagate to viewers when MaterialID changesdahlia2013-04-171-0/+2
| |
* | Merge branch 'master' into careminsterMelanie2013-04-101-6/+6
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLAssetData.cs OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
| * Fix taking (and rezzing) of coalesced objects in the non-root subregions of ↵Justin Clark-Casey (justincc)2013-04-061-6/+6
| | | | | | | | | | | | | | | | | | megaregions. This fixes the combined bounding box location for regions bigger than 256x256. It also fixes the position on taking coalesced objects in the non-root regions, where position checks are properly done on rez instead. It also fixes the megaregion land channel to return null if the land does not exist, which should probably also be done for the ordinary land channels rather than returning a dummy region. Inspiration from Garmin's commit in http://opensimulator.org/mantis/view.php?id=6595. Thanks!
* | Merge commit '94d44142e37a9191162a426f28dd23f40b0cf4aa' into careminsterMelanie2013-04-041-11/+2
|\ \ | |/
| * Fix minor race condition in SOP.SitTargetOrientationLL where inconsistent ↵Justin Clark-Casey (justincc)2013-04-031-11/+2
| | | | | | | | values could be returned if the sit orientation was changed whilst the property was being fetched.
* | Merge branch 'master' into careminsterMelanie2013-04-021-5/+6
|\ \ | |/
| * Use consistent GroupPosition value Make SOP.UpdateGroupPosition() rather ↵Justin Clark-Casey (justincc)2013-04-031-5/+6
| | | | | | | | than one that could change whilst the method is being executed.
* | Merge branch 'master' into careminsterMelanie2013-04-021-1/+1
|\ \ | |/
| * fix minor race condition in SOP.SitTargetPositionLL where inconsistency ↵Justin Clark-Casey (justincc)2013-04-031-1/+1
| | | | | | | | could occur if the sit target position changed whilst the property was fetched
* | Merge branch 'master' into careminsterMelanie2013-04-021-7/+7
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * minor: Make SOP.UpdateOffset() more consistent by checking against the same ↵Justin Clark-Casey (justincc)2013-04-031-7/+7
| | | | | | | | old OffsetPosition rather than one which may vary if it simultaneously changes.
| * Fix minor race condition where SOP.GetGeometricCenter() and ↵Justin Clark-Casey (justincc)2013-04-021-4/+4
| | | | | | | | | | | | GetCenterOfMass() could return results which were never the case if these values were changed whilst the method was running No need to create new Vector3s since these are structs.
| * Export permission, part two. Setting export perms for textures and clothing ↵Melanie2013-03-313-10/+74
| | | | | | | | | | | | works. Setting perms for prims also works but they don't propagate correctly yet. NOT FOR PRODUCTIN USE. Your database will need to be updated before you can use this!
* | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2013-03-314-79/+95
|\ \
| * \ Merge branch 'master' into careminsterMelanie2013-03-291-5/+2
| |\ \ | | |/ | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| | * Check viewer 2/3 attachment calls against avatar appearance attachment data ↵Justin Clark-Casey (justincc)2013-03-291-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | rather than actually attached objects By checking against the grid's Avatar data, we can ignore viewer side attachments but still initiate these calls simulator-side. Initiating simulator-side is always necessary for version 1 viewers. This is a further commit to resolve http://opensimulator.org/mantis/view.php?id=6581
| * | Merge commit '23ae4c0a4d813763bcc39db7693850a21727d7f2' into careminsterMelanie2013-03-293-1/+33
| |\ \ | | |/ | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
| | * Fix bug where CHANGED_REGION and/or CHANGED_TELEPORT weren't firing for ↵Justin Clark-Casey (justincc)2013-03-293-1/+30
| | | | | | | | | | | | | | | | | | | | | | | | scripts in attachments. This was because the script resumption in AttachmentsModule was firing the attach event instead. Had to reinstate the code in 285bd3a do we can resume the scripts there instead, though the bug existed before its removal. This is to resolve http://opensimulator.org/mantis/view.php?id=6578
generated by cgit v1.1 at 2025-02-28 02:52:22 +0000