aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Interfaces (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Merge master into teravuswork", it should have been avination, not ↵teravus2012-11-1510-319/+13
| | | | | | | master. This reverts commit dfac269032300872c4d0dc507f4f9062d102b0f4, reversing changes made to 619c39e5144f15aca129d6d999bcc5c34133ee64.
* Merge branch 'avination' into careminsterMelanie2012-11-041-0/+2
|\ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * Add a method to query all registered script constants to allow non-XEngineMelanie2012-11-041-0/+2
| | | | | | | | script engines to use them.
* | Merge branch 'master' into careminsterMelanie2012-10-311-0/+13
|\ \ | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/TaskInventoryItem.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
| * | Make "show object part" command correctly display script status.Justin Clark-Casey (justincc)2012-10-311-0/+13
| | | | | | | | | | | | | | | Uses new IEntityInventory.TryGetScriptInstanceRunning() Makes it clearer that TaskInventoryItem.ScriptRunning cannot be used as it is temporary and not updated.
* | | Merge branch 'master' into careminsterMelanie2012-10-301-3/+90
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | documenting some params on ISoundModule methodsSignpostMarv2012-10-291-7/+16
| | |
| * | Refactoring llTriggerSoundLimited with a new method on ISoundModule, as the ↵SignpostMarv2012-10-291-0/+3
| | | | | | | | | | | | LL Wiki spec for llTriggerSoundLimited states an axis-aligned bounding box, not radial constraint
| * | shuffling code around so that the interface for ISoundModule.SendSound() ↵SignpostMarv2012-10-291-1/+1
| | | | | | | | | | | | specifies a UUID rather than a string
| * | moving SendSound from SceneObjectPart to ISoundModuleSignpostMarv2012-10-291-0/+15
| | |
| * | deduplicating code into a single LoopSound methodSignpostMarv2012-10-291-4/+5
| | |
| * | adjusting parameter order of PreloadSound to be more logicalSignpostMarv2012-10-291-2/+2
| | |
| * | transposing LoopSoundMaster to Sound ModuleSignpostMarv2012-10-291-0/+11
| | |
| * | transposing preload sound onto sound moduleSignpostMarv2012-10-291-0/+10
| | |
| * | transposing stop sound into sound moduleSignpostMarv2012-10-291-0/+6
| | |
| * | documenting ISoundModule methods & fieldsSignpostMarv2012-10-291-0/+28
| | |
| * | formatting ISoundModule prior to documentationSignpostMarv2012-10-291-2/+4
| | |
| * | stripping whitespace from ISoundModule, formatting SoundModuleNonShared.csSignpostMarv2012-10-291-1/+1
| | |
| * | making the max distance for sounds to be heard from their origin a ↵SignpostMarv2012-10-291-0/+2
| | | | | | | | | | | | configurable option exposed via a public field on ISoundModule (with private setter in the implementation)
* | | Merge branch 'master' into careminsterMelanie2012-10-261-1/+25
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
| * | refactoring IWorldCommListenerInfo.GetRegexBitfield() method to be a field ↵SignpostMarv2012-10-261-2/+1
| | | | | | | | | | | | with a private setter
| * | adding ability for listeners to be filtered by regular expressions and a ↵SignpostMarv2012-10-261-0/+25
| | | | | | | | | | | | general-purpose function to see if a given string matches a given regex
| * | Formatting and casing correction in WorldCommModule, trailing new line in ↵SignpostMarv2012-10-261-1/+1
| | | | | | | | | | | | OSSL to get git diff to not complain
* | | Merge branch 'master' into careminsterMelanie2012-10-181-3/+11
|\ \ \ | |/ /
| * | Add number of inventory items to information displayed via "show part" ↵Justin Clark-Casey (justincc)2012-10-181-3/+11
| | | | | | | | | | | | console command
* | | Merge branch 'master' into careminsterMelanie2012-10-071-1/+28
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
| * | minor: Add missing license information from the top of IUserManagementJustin Clark-Casey (justincc)2012-10-051-1/+28
| | |
* | | Merge branch 'master' into careminsterMelanie2012-10-031-0/+9
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
| * | implementing osDropAttachment & osDropAttachmentAtSignpostMarv2012-10-021-0/+9
| | |
* | | Merge branch 'avination' into careminsterMelanie2012-09-271-1/+1
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * | If an asset upload transaction doesn't exist for a CreateInventory request,Melanie2012-09-241-1/+1
| | | | | | | | | | | | simply process it as if UUID.Zero had been given.
* | | Merge branch 'master' into careminsterMelanie2012-09-171-1/+41
|\ \ \ | | |/ | |/|
| * | Documentation of IScriptModuleComms.RegisterConstant and ↵SignpostMarv2012-09-171-1/+18
| | | | | | | | | | | | | | | | | | IScriptModuleComms.LookupModConstant Signed-off-by: Melanie <melanie@t-data.com>
| * | Implementing ability to register script constants and invocations on a ↵SignpostMarv2012-09-171-0/+23
| | | | | | | | | | | | region module automatically
* | | Merge branch 'master' into careminsterMelanie2012-09-162-1/+5
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs OpenSim/Region/Framework/Scenes/EventManager.cs
| * | Support multi-region OAR filesOren Hurvitz2012-09-141-0/+5
| | | | | | | | | | | | Merged ArchiveWriteRequestPreparation.cs and ArchiveWriteRequestExecution.cs. This simplifies the code, and it's faster to write each scene to the archive as it's found rather than all at once at the end.
| * | Allow an incoming identifier to be specified for a JsonStore.Mic Bowman2012-09-111-1/+1
| | |
* | | Merge branch 'avination' into careminsterMelanie2012-09-101-2/+2
|\ \ \ | | |/ | |/|
| * | Refactor avatar transfer so that the heavy (UpdateAgent) part is separated intoMelanie2012-09-041-2/+2
| | | | | | | | | | | | it's own sub-method
* | | Merge branch 'master' into careminsterMelanie2012-09-071-3/+54
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs OpenSim/Framework/Servers/VersionInfo.cs
| * | If reusing dynamic textures, do not reuse small data length textures that ↵Justin Clark-Casey (justincc)2012-09-061-3/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | fall below current viewer discard level 2 thresholds. Viewer LL 3.3.4 and before sometimes fail to properly redisplay dynamic textures that have a small data length compared to pixel size when pulled from cache. This appears to happen when the data length is smaller than the estimate discard level 2 size the viewer uses when making this GetTexture request. This commit works around this by always regenerating dynamic textures that fall below this threshold rather than reusing them if ReuseDynamicTextures = true This can be controlled by the [Textures] ReuseDynamicLowDataTextures config setting which defaults to false.
* | | Merge branch 'master' into careminsterMelanie2012-08-311-0/+29
|\ \ \ | |/ /
| * | adding support for static method script invocationsSignpostMarv2012-08-311-2/+9
| | |
| * | adding documentation to script invokation methodsSignpostMarv2012-08-311-0/+22
| | |
* | | Merge branch 'master' into careminsterMelanie2012-08-311-0/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
| * | This partially implements the LSL function to set the responseMic Bowman2012-08-291-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | type for an HTTP request. Since the "official" LSL function limits the use of the response type, it is implemented as osSetContentType with a string for the content mime type and a threat level of high. With this function you should be able to implement rather functional media-on-a-prim application with much less difficulty.
* | | Merge branch 'master' into careminsterMelanie2012-08-291-2/+14
|\ \ \ | |/ / | | / | |/ |/| | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
| * Add experimental DynamicTextureModule.ReuseTextures flag, currently only ↵Justin Clark-Casey (justincc)2012-08-281-1/+13
| | | | | | | | | | | | | | | | | | | | | | configurable on compile. Disabled (status quo) by default. This flag makes the dynamic texture module reuse cache previously dynamically generated textures given the same input commands and extra params for 24 hours. This occurs as long as those commands would always generate the same texture (e.g. they do not contain commands to fetch data from the web). This makes texture changing faster as a viewer-cached texture uuid is sent and may reduce simulator load in regions with generation of lots of dynamic textures. A downside is that this stops expiry of old temporary dynamic textures from the cache, Another downside is that a jpeg2000 generation that partially failed is currently not regenerated until restart or after 24 hours.
| * Add IDynamicTextureManager.ConvertData() to match AsyncConvertData(). ↵Justin Clark-Casey (justincc)2012-08-281-1/+1
| | | | | | | | Remove mismatching ConvertStream() where there is no AsyncConvertStream and neither IDynamicTextureManager implementer implements this method.
| * Add a skeleton for a name value storage associated with regionsMelanie2012-08-152-0/+11
| |