aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-06-041-1/+1
|\ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
| * Fix passing of voice distance attenuation to the Vivox voice server.Justin Clark-Casey (justincc)2013-05-301-1/+1
| | | | | | | | | | Because of a typo, this wasn't being done at all - now the 'default' value as described in OpenSimDefaults.ini of 10m is passed (vivox_channel_clamping_distance) Thanks to Ai Austin for spotting this.
* | Merge branch 'master' into careminsterMelanie2013-05-305-31/+37
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-05-284-18/+13
| |\
| | * Update the money framework to allow sending the new style linden "serverside ↵Melanie2013-05-254-17/+12
| | | | | | | | | | | | | | | | | | is now viewerside" messages regarding currency This will require all money modules to be refactored!
| | * This is an experimental patch that adds support for comparing textureMic Bowman2013-05-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | hashes for the purpose of accurately responding to AgentTextureCached packets. There is a change to IClientAPI to report the wearbles hashes that come in through the SetAppearance packet. Added storage of the texture hashes in the appearance. While these are added to the Pack/Unpack (with support for missing values) routines (which means Simian will store them properly), they are not currently persisted in Robust.
| * | First change in Vivox for ages! -- added a lock to serialize calls to vivox ↵Diva Canto2013-05-281-14/+25
| |/ | | | | | | servers. This may ameliorate things when lots of avies arrive in a sim at about the same time. Turns out that there are 4 http requests per avie to Vivox.
* | Merge branch 'master' into careminsterMelanie2013-05-112-2/+2
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Services/LLLoginService/LLLoginResponse.cs OpenSim/Services/LLLoginService/LLLoginService.cs OpenSim/Tests/Common/Mock/TestClient.cs
| * remove pointless region handle paramter from IClientAPI.SendKillObject()Justin Clark-Casey (justincc)2013-05-092-2/+2
| |
* | Merge branch 'master' into careminsterMelanie2013-05-082-0/+12
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Framework/IClientAPI.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
| * Adds an event and a method so that handling of the CachedTextureMic Bowman2013-05-082-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | packet can be pulled out of LLClientView and moved to AvatarFactory. The first pass at reusing textures (turned off by default) is included. When reusing textures, if the baked textures from a previous login are still in the asset service (which generally means that they are in the simulator's cache) then the avatar will not need to rebake. This is both a performance improvement (specifically that an avatars baked textures do not need to be sent to other users who have the old textures cached) and a resource improvement (don't have to deal with duplicate bakes in the asset service cache).
* | Merge branch 'master' into careminsterMelanie2013-04-291-1/+1
|\ \ | |/
| * Unbreak the sample money moduleMelanie2013-04-271-0/+2
| |
| * Small oversight in EconomyDataRequest - this would have affected everyone ↵Melanie2013-04-271-2/+0
| | | | | | | | NOT using a money module.
* | Merge branch 'master' into careminsterMelanie2013-04-251-11/+6
|\ \ | |/
| * Change EconomyDataRequest signature to use an IClientAPI rather than UUID. ↵Melanie2013-04-251-11/+6
| | | | | | | | | | | | This is needed because recent LL viewer codebases call this earlier in login when the client is not yet established in the sim and can't be found by UUID. Sending the reply requires having the IClientAPI.
| * Change copyright notice on DynamicMenuModule to proper BSDMelanie2013-04-251-5/+26
| |
* | 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
generated by cgit v1.1 at 2024-12-23 00:45:48 +0000