aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
* 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
| * Add prototype dynamic objects map for scene object partsJustin Clark-Casey (justincc)2013-03-131-0/+22
| | | | | | | | | | | | | | | | | | 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.
| * minor: remove mono compiler warning in SceneObjectUndoRedoTestsJustin Clark-Casey (justincc)2013-03-111-2/+2
| |
| * * Apparently, sometimes texture entries come in from the wire with no ↵teravus2013-03-081-0/+17
| | | | | | | | default texture defined.. so apply better fallback protection against that. The net result is clients will have their selected textures set when they would have previously had an ignored exception.
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-03-061-1/+13
| |\
| | * Per discussions with justincc... split the JsonStore typeMic Bowman2013-03-051-1/+13
| | | | | | | | | | | | | | | functions into one for node type and one for value type. Define and export constants for both nodes and values.
| * | Add code for testing event queue messages recevied on region cross.Justin Clark-Casey (justincc)2013-03-061-5/+22
| | | | | | | | | | | | This is currently disabled pending an improvement in the test code to properly add avatars when an event queue module is present.
| * | Add regression test for presence crossing between regions on the same simulator.Justin Clark-Casey (justincc)2013-03-063-121/+159
| |/ | | | | | | Unlike a much earlier commented out version of this test, this is done in synchronous mode.
* | Multiattach, part 1Melanie2013-03-182-2/+2
|/ | | | | | | | | | | | 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
* Move AllowedClients and BannedClients section to new [AccessControl] section ↵Justin Clark-Casey (justincc)2013-03-021-2/+10
| | | | | | | in OpenSim.ini from [Startup] This change also corrects the setting names - they were actually wrong (though the text in {} was correct). If there are settings in [Startup] they will continue to be used and anything there will override settings in [AccessControl]
* Add regression tests for llGetNotecardLine()Justin Clark-Casey (justincc)2013-02-281-2/+2
|
* Get "show modules" console command to obey selected command line region/sJustin Clark-Casey (justincc)2013-02-271-16/+11
|
* Add regression test for llRequestUrl()Justin Clark-Casey (justincc)2013-02-261-0/+11
|
* Move map related settings from [Startup] to a new [Map] section in OpenSim.iniJustin Clark-Casey (justincc)2013-02-251-2/+9
| | | | | | | Existing map settings in [Startup] will continue to work, and if present will override anything in [Map] However, the proper place for such settings would now be [Map] This is to reduce the use of [Startup] as a bag for non-generic settings which should really go in sections, in common with other settings. This commit also extends Diva's previous work to allow a default setting to be given when looking at multiple sections for settings.
* minor: Add doc to ScenePresence.IsInTransit to make it clear that this is ↵Justin Clark-Casey (justincc)2013-02-221-0/+6
| | | | set only for region crossing and not teleport, etc.
* Fix the JsonStore path set problem justincc found earlier today andMic Bowman2013-02-191-1/+0
| | | | remove the deprecated TestPath functions.
* Deleted all AssemblyFileVersion directivesDiva Canto2013-02-191-1/+1
|
* * Fix walking to <NaN, NaN, NaN> via autopilot.teravus2013-02-161-1/+5
|
* Add regression test TestSaveNonRootFolderToIarJustin Clark-Casey (justincc)2013-02-163-5/+5
|
* Rename new JsonScript functions JsonPathType() -> JsonGetPathType() and ↵Justin Clark-Casey (justincc)2013-02-141-2/+2
| | | | | | | | JsonArrayLength() -> JsonGetArrayLength() This is for consistentency with the verb:noun naming approach existing json script functions and other script functions. Corresponding c# methods also changed since verb:noun is also the .net c# method naming guideline (as used by OpenSimulator) and for consistency with script functions. As agreed with cmickeyb
* Add EventManager events triggered when a SOP is added or removedRobert Adams2013-02-142-0/+57
| | | | from the physical scene. Invocations added in SceneObjectPart.
* Add an event and some logic to allow customizing Simulator Features by avatarMelanie2013-02-141-1/+5
|
* Adds a couple requested functions to the JsonStore scriptMic Bowman2013-02-131-0/+15
| | | | | | interface. JsonPathType returns the type of node pointed to by the path and deprecates the functionality of both JsonTestPath functions. JsonArrayLength returns the length of an array node.
* Fix code to check for no spawn points. Possibly a merge artefact?Melanie2013-02-101-2/+4
|
* Fix teleport/telehub issue:BlueWall2013-02-102-3/+17
| | | | Fix bug that allowed only login access to regions with mis-configured telehubs. Administrators now have teleport access when there exists a mis-configured telehub in the region. Estate owners are now placed at region center in the absence of spawnpoints instead of being denied access. Grid Gods are unrestricted. All others are denied access to the region until spawnpoints are assigned to the telehub object.
* If a component of a coalesced object fails to deserialization, do not add a ↵Justin Clark-Casey (justincc)2013-02-081-4/+18
| | | | | | | null where the object should be. This prevents a later load IAR failure. This code is currently only used by IAR loading.
* Actually plumb the new values to physics.Melanie2013-02-071-0/+20
|
* Add some more code from Avination. This changes physics actor stuff aroundMelanie2013-02-071-37/+152
| | | | to work with the new params. Not actually plumbed just yet.
* Plumb the path from the client to the extra physics params and backMelanie2013-02-073-2/+26
|
* Revert "Add plumbing for physics properties to get to the physics engine."Melanie2013-02-071-50/+6
| | | | This reverts commit c658fa1c0dd83f23c66ccfedb12e8ab02ff01d0a.
* Add plumbing for physics properties to get to the physics engine.Robert Adams2013-02-071-6/+50
| | | | Addition of entries to PhysicsActor and setting code in SceneObjectPart.