aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Process default attachment point in AttachObjectInternal before we check ↵Justin Clark-Casey (justincc)2013-03-191-27/+27
| | | | whether a worn object needs to displace an existing attachment on the same point if we are not using multi-attach.
* Fix tests for multiattachMelanie2013-03-182-6/+6
|
* Merge branch 'master' into newmultiattachMelanie2013-03-1810-131/+655
|\ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
| * Improve rejection of any attempt to reattach an object that is already attached.Justin Clark-Casey (justincc)2013-03-182-31/+194
| | | | | | | | This also adds/extends regression tests for wearing attachments directly for the scene and attempting to reattach/rewear already attached objects.
| * Fix recent regression where an item worn to an attachment point that was ↵Justin Clark-Casey (justincc)2013-03-182-89/+153
| | | | | | | | | | | | | | already occupied did not remove the previous attachment (current behaviour) Regression was commit ccd6f4 (Tue Mar 5 23:47:36 2013) Added regression test for this case.
| * Add example code to DOExampleModule to pull data from that previously saved ↵Justin Clark-Casey (justincc)2013-03-152-5/+29
| | | | | | | | by DAExampleModule when instantiating a dynamc object.
| * Add ParentGroup.HasGroupChanged = true setting to DAExampleModule as this is ↵Justin Clark-Casey (justincc)2013-03-151-0/+2
| | | | | | | | necessary to get attributes to save (though this probably happens anyway due to the prim move)
| * Add ILandChannel.GetLandObject(Vector3 position) as this is a very common ↵Justin Clark-Casey (justincc)2013-03-141-0/+5
| | | | | | | | | | | | input to GetLandObject() This conforms to the existing ILandChannel.ParcelsNearPoint() method
| * Improve DAExampleModule to show current necessary locking to avoid race ↵Justin Clark-Casey (justincc)2013-03-131-8/+16
| | | | | | | | conditions with a serialization thread.
| * Add prototype dynamic objects map for scene object partsJustin Clark-Casey (justincc)2013-03-131-0/+117
| | | | | | | | | | | | | | | | | | 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: save some commented out log lines which will be useful again in ↵Justin Clark-Casey (justincc)2013-03-131-0/+5
| | | | | | | | future debugging of VectorRenderModule
| * Add DisableInterRegionTeleportCancellation option in [EntityTransfer] ↵Justin Clark-Casey (justincc)2013-03-121-1/+20
| | | | | | | | | | | | | | | | | | section of OpenSim.ini. False by default. This option allows the simulator to specify that the cancel button on inter-region teleports should never appear. This exists because sometimes cancellation will result in a stuck avatar requiring relog. It may be hard to prevent this due to the protocol design (the LL grid has the same issue) In small controlled grids where teleport failure is practically impossible it can be better to disable teleport cancellation entirely.
| * Improve teleport cancellation in some circumstances, though cancelling ↵Justin Clark-Casey (justincc)2013-03-122-34/+149
| | | | | | | | | | | | | | | | | | | | | | | | teleports is still not recommended. Previously, hitting the cancel button on a teleport would cancel on the client side but the request was ignored on the server side. Cancel would still work if the teleport failed in the early stages (e.g. because the destination never replied to early CreateAgent and UpdateAgent messages). But if the teleport still completed after a delay here or later on, the viewer would become confused (usual symptom appears to be avatar being unable to move/reteleport). This commit makes OpenSimulator obey cancellations which are received before it sends the TeleportFinish event queue message and does proper cleanup. But cancellations received after this (which can happen even though the cancel button is removed as this messages comes on a different thread) can still result in a frozen avatar. This looks extremely difficult and impossible to fix. I can replicate the same problem on the Linden Lab grid by hitting cancel immediately after a teleport starts (a teleport which would otherwise quickly succeed).
| * minor: remove some completely unused string local vars added recently in ↵Justin Clark-Casey (justincc)2013-03-061-2/+0
| | | | | | | | commit 984faf2
| * Add code for testing event queue messages recevied on region cross.Justin Clark-Casey (justincc)2013-03-062-3/+11
| | | | | | | | This is currently disabled pending an improvement in the test code to properly add avatars when an event queue module is present.
| * minor: Fix mono compiler warning in MonitorModuleJustin Clark-Casey (justincc)2013-03-051-2/+0
| |
* | Merge commit 'ccd6f443e1092cb410f565e921f7cf4dd8cd2dac' into newmultiattachMelanie2013-03-181-139/+167
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
| * Get attachment script state before taking sp.AttachmentsSyncLock() to avoid ↵Justin Clark-Casey (justincc)2013-03-051-140/+161
| | | | | | | | | | | | race conditions between closing agents and scripts that may be doing attachment manipulation. This is in an effort to resolve http://opensimulator.org/mantis/view.php?id=6557
* | Limit each attachment point to 5 items as per specMelanie2013-03-181-3/+13
| |
* | Multiattach, part 1Melanie2013-03-182-33/+31
|/ | | | | | | | | | | | 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
* Moved permissions config vars out of [Startup] into [Permissions]. Backwards ↵Diva Canto2013-03-011-21/+33
| | | | compatible ([Startup] still being looked up), but please update your configs sometime soon.
* Switched to using the other Util function with a default value.Diva Canto2013-02-272-3/+6
|
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-02-273-47/+61
|\
| * Add regression test for llReleaseUrl() (and for llRequestUrl)Justin Clark-Casey (justincc)2013-02-271-9/+16
| | | | | | | | Forgot to add file for llRequestUrl() test in commit b8a7c8b
| * Make sure we dispose of WebResponse, StreamReader and Stream in various ↵Justin Clark-Casey (justincc)2013-02-272-22/+24
| | | | | | | | places where we were not already.
| * Add regression test for llRequestUrl()Justin Clark-Casey (justincc)2013-02-261-16/+21
| |
* | Moved the HG default variables out of [Startup] and into their own section ↵Diva Canto2013-02-272-3/+3
|/ | | | [Hypergrid] in *Common.ini.example. Backwards compatible for now.
* Move map related settings from [Startup] to a new [Map] section in OpenSim.iniJustin Clark-Casey (justincc)2013-02-254-31/+26
| | | | | | | 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.
* Add StatsManager registration for region specific stats as collectedRobert Adams2013-02-241-1/+47
| | | | | by MonitorModule. Left existing functionality (command line and HTTP fetch) and just added StatsManager registration.
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-02-221-42/+81
|\
| * Make reset of EntityTransferStateMachine for an avatar transfer always ↵Justin Clark-Casey (justincc)2013-02-221-42/+81
| | | | | | | | | | | | | | happen despite unexpected exceptions. This means that if such an exception does occur, the region does not need to be reset before that user can teleport from it again. This is all Oren's code from his patch in http://opensimulator.org/mantis/view.php?id=6374 but I've chosen to split it in two.
* | Added new Util function for reading config vars that's more generic than the ↵Diva Canto2013-02-222-4/+5
|/ | | | one I added yesterday -- this is for helping move config vars out of [Startup]
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-02-211-1/+1
|\
| * minor: Change summary in "show appearance" console command to "incomplete" ↵Justin Clark-Casey (justincc)2013-02-211-1/+1
| | | | | | | | | | | | | | rather than "corrupt" Corrupt is misleading - it implies textures were uploaded but are not j2k valid. The actual situation is that at least one required baked texture is not present.
* | Simplification of HG configs: HomeURI and GatekeeperURI now are defined as ↵Diva Canto2013-02-212-6/+7
|/ | | | default under [Startup]. They can then be overwritten in the other sections (but probably shouldn't). I kept the existing code for backwards compatibility, so this should not cause any breaks from people's current configurations. But people should move to have these 2 vars under [Startup] -- see OpenSim.ini.example and Robust.HG.ini.example. And yes, both names now end with "URI" for consistency.
* Add flush after write feature to LogWriterRobert Adams2013-02-201-1/+12
|
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-02-201-1/+1
|\
| * Deleted all AssemblyFileVersion directivesDiva Canto2013-02-191-1/+1
| |
* | Correct mistake in parsing 'show object pos' and similar pos commands where ↵Justin Clark-Casey (justincc)2013-02-201-5/+5
|/ | | | | | the 'to' text would be treat as the end vector rather than discarded. Before this, the commands still work but the help text is wrong - one has to leave out the 'to' in stating the vectors
* Separate IAR tests into separate files for load/save/loadpath testsJustin Clark-Casey (justincc)2013-02-163-245/+198
|
* Make it so that "load iar / ..." does not save the 'root' "My Inventory" folder.Justin Clark-Casey (justincc)2013-02-162-1/+60
| | | | | | | | Really "My Inventory" is just the name of the root, it isn't a folder in its own right. This also makes it more intuitive for users to save whole inventory iars for backup/later restoration, as they don't need to remember to use /* /* will still work and this is a special case just for the root If you want to save only the contents of other folders (rather than the folder itself), you still need to specify something like a/b/* Added a regression test for this case.
* Add regression test TestSaveNonRootFolderToIarJustin Clark-Casey (justincc)2013-02-167-29/+183
|
* * Handle null check on configs in module startup so that the the code can be ↵teravus2013-02-142-7/+9
| | | | run on 'stop on handled and unhandled null reference exceptions' mode without pausing during startup a bunch of times. I don't think exceptions were really meant for replacing a single if statement...
* minor: remove some mono compiler warningsJustin Clark-Casey (justincc)2013-02-142-2/+2
|
* Don't allow exceptions to propogate from FlotsamAssetCache which may occur ↵Justin Clark-Casey (justincc)2013-02-081-32/+57
| | | | | | when deleting expired files or stamping the region status file. Changes various error level log lines to warn since these are not fatal to the operation of OpenSimulator
* On IAR loading, if loading of a coaleseced item entirely fails, then ↵Justin Clark-Casey (justincc)2013-02-081-0/+18
| | | | continue with the IAR load rather than failing completely.
* Merge branch 'dynamic-attributes2'Justin Clark-Casey (justincc)2013-02-052-0/+144
|\
| * Added unit tests for Dynamic AttributesOren Hurvitz2013-01-251-0/+37
| |
| * Disabled DAExampleModuleOren Hurvitz2013-01-251-5/+13
| |
| * Changed DAMap to be the container of "data stores", which are OSDMaps. Store ↵Oren Hurvitz2013-01-251-12/+13
| | | | | | | | names must have at least 4 characters.