aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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!
* 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' 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.
* Step 2: commit the IEstateModuleInterface changes neededMelanie2013-05-071-1/+2
|
* Step one of estate settings sharing - port the Avination Estate module ↵Melanie2013-05-072-3/+4
| | | | (complete module) as changes are too extensive to apply manually
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-05-062-9/+106
|\
| * 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.
* | 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.
* UUIDGatherer now includes UUIDs which reference texture assets used as materialsdahlia2013-04-241-0/+66
|
* Adding the dynamic menu module which allows registering new menu options in ↵Melanie2013-04-251-0/+57
| | | | compliant viewers
* Add Avination's support for parcel eject and freezeMelanie2013-04-251-15/+25
|
* 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
|
* 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!
* Fix bug where outstanding llHTTPRequests for scripts were not being aborted ↵Justin Clark-Casey (justincc)2013-04-041-1/+7
| | | | | | | | | when they were deleted. This was because AsyncCommandManager was handing an item ID to IHttpRequestModule.StopHttpRequest() rather than the expected request ID. This commit also makes the http request asynchronous using BeginGetResponse() rather than doing this by launching a new thread so that we can more safely abort it via HttpWebRequest.Abort() rather than aborting the thread itself. This also renames StopHttpRequest() to StopHttpRequestsForScript() since any outstanding requests are now aborted and/or removed.
* 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.
* 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.
* 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
* 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!
* Added missing functionality (mainly custom headers) to llHTTPRequest.Kevin Cozens2013-03-291-0/+3
|
* 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
* 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
* Eliminate code which tries to restart attachment scripts in ↵Justin Clark-Casey (justincc)2013-03-291-18/+0
| | | | ScenePresence.MakeRootAgent(), since this is already done in AttachmentsModule
* Stop attempts to update/add existing attachments in user inventory when ↵Justin Clark-Casey (justincc)2013-03-281-2/+4
| | | | | | teleporting between regions. This appears to resolve issues on teleport where attachments disappear or become labelled as invalid within user inventory.
* minor: comment out unused Scene.AgentCrossing() to reduce code complexityJustin Clark-Casey (justincc)2013-03-281-27/+27
|
* If the viewer has already rezzed any attachments itself, then ignore the ↵Justin Clark-Casey (justincc)2013-03-282-7/+9
| | | | | | simulator-side rez attachments call. This is a further effort to reduce v3 viewer race conditions where this call may clash with the viewer signalling attachment wearing from its current outfit folder.
* Fix regression tests by making a new NPC always trigger simulator side ↵Justin Clark-Casey (justincc)2013-03-281-2/+2
| | | | | | attachment code when created. Regression from previous commit c2093ccc. Failed because NPCs don't set the ViaLogin flag
* Move the simulator-side RezAttachments call on login to SP.MakeRootAgent ↵Justin Clark-Casey (justincc)2013-03-282-38/+31
| | | | | | | | with the other attachments code, using TeleportFlags.ViaLogin check to fire if necessary. This is to simplify the code (no tricky 'wasChild' signalling required) and to reduce the risk of a thread clash between simulator-side attaching (necessary for v1 viewers) and the viewer-side attaching the v3 viewers perform.
* Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMaskMelanie2013-03-266-3/+9
| | | | with our own and add export permissions as well as a new definition for "All" as meaning "all conventional permissions" rather than "all possible permissions"
* Fix teleporting into the non-SW 256x256 corner of a megaregion, though ↵Justin Clark-Casey (justincc)2013-03-231-0/+7
| | | | | | | | currently with a 10 second delay before auto-reteleport to the correct location. This now does a check for border crossing (required to trigger the teleport) immediately in SP.MakeRootAgent(). If left any later, it looks like the physics scene changes the position and stops the cross happening. If done any earlier, nothing happens because the cross-code currently requires a PhysicsActor to be in place, thuogh it's probably not necessary for this case.
* Add "show borders" command to show the borders of a region.Justin Clark-Casey (justincc)2013-03-233-6/+16
| | | | | This is relevant to mega-regions where the borders are very different to a regular region. Also adds some method doc and other code comments.
* On a teleport, lock m_agentsInTransit whilst we grab the value to check for ↵Justin Clark-Casey (justincc)2013-03-211-4/+4
| | | | completion just to be sure we're not using a thread cached version.
* minor: disable logging on regression TestCrossOnSameSimulator() that I ↵Justin Clark-Casey (justincc)2013-03-201-1/+1
| | | | accidentally left on a few commits ago.
* minor: don't bother with the pause before rezzing attachments if we are ↵Justin Clark-Casey (justincc)2013-03-201-1/+15
| | | | | | running regression tests (fire and forget calls launched on the same thread). Also adds code comments as to why this pause exists.
* On the later forms of teleport failure, tell the user if this was because ↵Justin Clark-Casey (justincc)2013-03-202-23/+121
| | | | | | | 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.
* Insert a short delay on the simulator side rezzing of attachments in order ↵Justin Clark-Casey (justincc)2013-03-201-1/+1
| | | | | | | | | to fix viewer 3 issues if its own rezzing actions on login collide with the simulator side actions. This resolves issues (at least in my tests with LL 3.3.4) where this can make attachments invisible until one zooms in on the avatar. This doesn't affect version 1 viewers since this delay is shorter than the login delay. This doesn't increase the login time since this part of the process was already being performed asynchronously. This may be a temporary solution.
* Force a viewer object update for attachments at the end of the final ↵Justin Clark-Casey (justincc)2013-03-201-0/+9
| | | | | | | Scene.CompleteMovement() in order to make all multi-attachments appear on the destination region. For some reason, sending updates before this will not have this effect. This may be something related to some viewers (e.g. LL 3.3.4) or something OpenSimulator isn't getting quite right.
* Merge branch 'master' into newmultiattachMelanie2013-03-186-129/+264
|\ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
| * Make llGetObjectDetails() return the correct world rotation for a sitting avatarJustin Clark-Casey (justincc)2013-03-141-5/+35
| | | | | | | | | | | | This addresses http://opensimulator.org/mantis/view.php?id=6567 This creates a ScenePresence.GetWorldRotation() with the same semantics as SOP.GetWorldRotation() SP.Rotation can't be used since it's relative to the sat upon prim if the avatar is sitting.
| * Remove unnecessary instation of DOMap() in SOP from commit 5c53660 since ↵Justin Clark-Casey (justincc)2013-03-131-1/+0
| | | | | | | | this is being done lazily