aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
* 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-281-7/+5
| | | | | | 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-185-128/+251
|\ | | | | | | | | 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.
| * 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-181-1/+1
|/ | | | | | | | | | | | 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
|
* 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 walking to <NaN, NaN, NaN> via autopilot.teravus2013-02-161-1/+5
|
* Add regression test TestSaveNonRootFolderToIarJustin Clark-Casey (justincc)2013-02-163-5/+5
|
* Add EventManager events triggered when a SOP is added or removedRobert Adams2013-02-142-0/+57
| | | | from the physical scene. Invocations added in SceneObjectPart.
* 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-072-2/+24
|
* 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.
* Rename "Bounciness" to "Restitution"Melanie2013-02-072-6/+6
|
* Partial port of Avination's support for the new physics parameters.Melanie2013-02-062-3/+136
| | | | | | | | Implements the parameters as properties, the serialization and database storage (MySQL only). Implements llSetPrimitiveParams for prim physics shape and the other 4 extra params. Only the prim shape type "None" is currently functional. No support for the Viewer UI (yet), that will be ported in due course. Lots more to port, this is a large-ish changeset.
* Remove long unused Scene.DumpAssetsToFile boolean.Justin Clark-Casey (justincc)2013-02-061-5/+0
|
* Remove very long unused IScriptHost and NullScriptHostJustin Clark-Casey (justincc)2013-02-063-138/+1
|
* Remove unused ScriptEngineLoader and ScriptEngineInterface in ↵Justin Clark-Casey (justincc)2013-02-063-168/+0
| | | | | | OpenSim.Region.Framework.dll I believe this predates the generic system of registering interfaces and is very long unused.
* Remove wrong code in ScriptUtils.GetAssetIdFromKeyOrItemName which would ↵Justin Clark-Casey (justincc)2013-02-061-15/+0
| | | | | | | | | return the item ID instead of the asset ID if the identifier was a uuid that matched an inventory item name. This would practically never happen. This makes this overloaded version of the function consistent with the other version. It looks like this accidentally came over in commit c5af16a from Tue Oct 16 12:40:21 2012 However, there's arguably a case for looking for an item name that matches a UUID before assuming that the identifier is already an asset ID.
* refactor: Move functions that lookup asset ids from task inventory or pass ↵Justin Clark-Casey (justincc)2013-02-061-0/+122
| | | | | | | them through to ScriptUtils class in OpenSim.Region.Framework.dll Renames functions to better reflect what they do. This is so that code registering with modInvoke() can reuse this code to provide functions that behave in a consistent manner with existing LSL/OSSL functions.
* Merge branch 'dynamic-attributes2'Justin Clark-Casey (justincc)2013-02-052-1/+24
|\
| * Added DynAttrs to the serialized XML format of prims. When copying prims, ↵Oren Hurvitz2013-01-252-0/+16
| | | | | | | | use deep copy for DynAttrs.
| * Encapsulate an OSDMap in DAMap (was DynAttrsOSDMap) rather than inheriting ↵Justin Clark-Casey (justincc)2013-01-251-2/+2
| | | | | | | | | | | | from it This is the easier way to give us control over locking, rather than asking that OSDMap IDictionary methods be virtual
| * Implement Dynamic Attributes for SOP and PBS. Implement storage in SQLiteJustin Clark-Casey (justincc)2013-01-251-1/+8
| |
* | minor: change comment about assuming script references are textures in ↵Justin Clark-Casey (justincc)2013-02-021-1/+2
| | | | | | | | UuidGatherer since this is no longer the behaviour.