aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-04-251-0/+282
|\
| * Adding the dynamic menu module which allows registering new menu options in ↵Melanie2013-04-251-0/+282
| | | | | | | | compliant viewers
* | Merge branch 'master' into careminsterMelanie2013-04-251-2/+4
|\ \ | |/
| * Fix issue in ConciergeModule where UpdateBroker was sending malformed XML if ↵Justin Clark-Casey (justincc)2013-04-231-2/+4
| | | | | | | | | | | | | | any number of avatars other than 1 was in the region. I don't know how well the rest of ConiergeModule works since I've practically never looked at this code. Addresses http://opensimulator.org/mantis/view.php?id=6605
| * Allow callers to set the invoice parameter for GenericMessageMelanie2013-04-222-4/+4
| |
* | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2013-04-221-0/+579
|\ \
| * \ Merge branch 'master' into careminsterMelanie2013-04-211-0/+579
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs bin/OpenMetaverse.StructuredData.XML bin/OpenMetaverse.XML bin/OpenMetaverseTypes.XML
| | * Materials persistence via SceneObjectPart.dynAttrs. This appears to work ↵dahlia2013-04-201-8/+154
| | | | | | | | | | | | across region restarts and taking objects into inventory, but probably will not work across archiving via OAR or IAR as materials texture assets may not be adequately referenced to trigger archiving.
| | * handle PUT verb for RenderMaterials Capdahlia2013-04-201-1/+5
| | |
| | * RenderMaterials POST Cap now return material entries when invoked with an ↵dahlia2013-04-191-61/+108
| | | | | | | | | | | | OSDArray of MaterialIDs
| | * remove default parameter value that apparently mono cant handledahlia2013-04-181-1/+1
| | |
| | * Initial experimental support for materials-capable viewers. This is in a ↵dahlia2013-04-181-0/+382
| | | | | | | | | | | | very early stage and this module is disabled by default and should only be used by developers for testing as this module could cause data corruption and/or viewer crashes. No materials are persisted yet.
* | | Allow callers to set the invoice parameter for GenericMessageMelanie2013-04-222-4/+4
|/ /
* | Merge commit 'c92654fb43f303da8e1623f9fff8a404aad72374' into careminsterMelanie2013-03-291-1/+1
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
| * Stop attempts to update/add existing attachments in user inventory when ↵Justin Clark-Casey (justincc)2013-03-281-1/+1
| | | | | | | | | | | | teleporting between regions. This appears to resolve issues on teleport where attachments disappear or become labelled as invalid within user inventory.
| * Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMaskMelanie2013-03-262-1/+3
| | | | | | | | 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"
* | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2013-03-262-1/+3
|\ \ | | | | | | | | | careminster
| * | Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMaskMelanie2013-03-242-1/+3
| | | | | | | | | | | | 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"
* | | Merge branch 'master' into careminsterMelanie2013-03-231-0/+31
|\ \ \ | |/ / |/| / | |/ | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * Add "show borders" command to show the borders of a region.Justin Clark-Casey (justincc)2013-03-231-0/+31
| | | | | | | | | | 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.
* | Merge branch 'master' into careminsterMelanie2013-03-221-10/+7
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
| * Fix "show attachments" command probably broken in commit addab12 (Wed Jan 2 ↵Justin Clark-Casey (justincc)2013-03-201-10/+7
| | | | | | | | | | | | 21:38:00 2013) This break was not connected with the recent attachment code changes.
| * Merge branch 'master' into newmultiattachMelanie2013-03-185-49/+156
| |\ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
| * | 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
* | | Merge branch 'master' into careminsterMelanie2013-03-151-15/+26
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: OpenSim/Framework/Servers/BaseOpenSimServer.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | Fix server statistics always reporting zero for total network bytes in/out.Robert Adams2013-03-151-15/+26
| | | | | | | | | | | | Clean up some parameter code in Statistics.Binary.
* | | Merge branch 'master' into careminsterMelanie2013-03-084-34/+130
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
| * | Per discussions with justincc... split the JsonStore typeMic Bowman2013-03-054-34/+130
| |/ | | | | | | | | functions into one for node type and one for value type. Define and export constants for both nodes and values.
* | Merge branch 'avination' into careminsterMelanie2013-03-061-1/+1
|\ \ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
| * | Multiattach, part 1Melanie2013-03-051-1/+1
| | |
| * | Revert "Output some additional data on Vivox connection errors", this logs ↵Melanie2013-02-241-1/+1
| | | | | | | | | | | | | | | | | | passwords! Bad! This reverts commit 79e477f6af09fae2d88a1bba45de6cb819e2800a.
| * | Output some additional data on Vivox connection errorsMelanie2013-02-241-1/+1
| | |
* | | Merge branch 'master' into careminsterMelanie2013-03-052-7/+8
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/MeshUploadFlagModule.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-03-021-6/+7
| |\ \
| | * | minor: Quieten down the parts of the WebSocketEcho module logging for now ↵Justin Clark-Casey (justincc)2013-03-021-6/+7
| | | | | | | | | | | | | | | | where it tells us it is added/loaded/removed from regions
| * | | Fixed typos in TempAttachmentsModule. No changes.Diva Canto2013-03-021-1/+1
| |/ /
* | | Merge branch 'master' into careminsterMelanie2013-03-013-4/+7
|\ \ \ | |/ /
| * | Moved permissions config vars out of [Startup] into [Permissions]. Backwards ↵Diva Canto2013-03-011-2/+3
| | | | | | | | | | | | compatible ([Startup] still being looked up), but please update your configs sometime soon.
| * | Add the Mono AddinDependency attribute to the example region modules.Justin Clark-Casey (justincc)2013-03-012-2/+4
| | | | | | | | | | | | It turns out this is required to get Mono.Addins to pick up plugin DLLs
* | | Merge branch 'master' into careminsterMelanie2013-02-282-0/+10
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneManager.cs
| * | Add comment to example region modules about need to add Assembly annotation ↵Justin Clark-Casey (justincc)2013-02-272-0/+10
| | | | | | | | | | | | if adding modules to a DLL which does not already have this
* | | Merge branch 'master' into careminsterMelanie2013-02-273-32/+47
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
| * | Make sure we dispose of WebResponse, StreamReader and Stream in various ↵Justin Clark-Casey (justincc)2013-02-273-32/+47
| | | | | | | | | | | | places where we were not already.
* | | Merge branch 'master' into careminsterMelanie2013-02-261-0/+328
|\ \ \ | |/ /
| * | Streamline stat registration code in ServerStats. Remove most of theRobert Adams2013-02-241-160/+50
| | | | | | | | | | | | | | | usage of ProcessCounters which tend to fail oddly and are not supported everywhere.
| * | Addition of ServerStats shared region module which collects and registersRobert Adams2013-02-241-0/+438
| | | | | | | | | | | | server wide statistics (CPU%, network bytes sent, ...) with StatsManager.
* | | Merge branch 'master' into careminsterMelanie2013-02-226-108/+16
|\ \ \ | |/ /
| * | 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.
| * | Fix the JsonStore path set problem justincc found earlier today andMic Bowman2013-02-193-95/+3
| | | | | | | | | | | | remove the deprecated TestPath functions.
| * | Deleted all AssemblyFileVersion directivesDiva Canto2013-02-191-1/+1
| | |
generated by cgit v1.1 at 2024-12-24 03:55:43 +0000