aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Scripting (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-11-131-0/+5
|\ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
| * Another 21 modules' directives moved out of .addin.xmlDiva Canto2012-11-131-0/+2
| |
* | Merge branch 'master' into careminsterMelanie2012-11-131-1/+1
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-11-121-1/+1
| |\
| * | Cleanup on region modules: gave short node id's to all of them.Diva Canto2012-11-121-1/+1
| | |
* | | Merge branch 'master' into careminsterMelanie2012-11-131-1/+1
|\ \ \ | | |/ | |/|
| * | Update ScriptModuleComms name space to CoreModulesMelanie2012-11-131-1/+1
| |/
* | Merge branch 'master' into careminsterMelanie2012-11-126-134/+244
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcRouterModule.cs OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
| * Fix issues with the DynamicTextureModule and corresponding unit tests.Diva Canto2012-11-113-32/+39
| |
| * One more module converted: XMLRPCModule. Removed it from the special loading ↵Diva Canto2012-11-111-31/+51
| | | | | | | | at start.
| * One more module converted: VectorRenderModule.Diva Canto2012-11-111-27/+41
| |
| * One more module: DynamicTextureModule. Removed it from the special load in ↵Diva Canto2012-11-111-11/+27
| | | | | | | | the beginning.
| * One more module converted: LoadImageURLModule. Also removed it from its ↵Diva Canto2012-11-111-19/+38
| | | | | | | | hard-coded instantiation (I think I understood what the problem was, and that I've done it right).
| * One more module converted: ScriptsHttpRequests.Diva Canto2012-11-111-9/+25
| |
| * One more module converted: EmailModule.Diva Canto2012-11-111-46/+64
| |
* | Merge branch 'master' into careminsterMelanie2012-11-111-75/+187
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
| * document, 80-character width terminal formatting converting comments to ↵SignpostMarv2012-11-101-15/+65
| | | | | | | | | | | | documentation for IDE & doxygen goodness Signed-off-by: Diva Canto <diva@metaverseink.com>
| * document & 80-character width terminal formattingSignpostMarv2012-11-101-56/+114
| | | | | | | | Signed-off-by: Diva Canto <diva@metaverseink.com>
| * Converting WorldCommModule to INonSharedRegionModuleSignpostMarv2012-11-101-11/+25
| | | | | | | | Signed-off-by: Diva Canto <diva@metaverseink.com>
| * Add a method to query all registered script constants to allow non-XEngineMelanie2012-11-041-0/+16
| | | | | | | | script engines to use them.
* | Merge branch 'avination' into careminsterMelanie2012-11-041-0/+16
|\ \ | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
* \ \ Merge branch 'master' into careminsterMelanie2012-10-261-23/+110
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | 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-12/+8
| | | | | | | | | | | | with a private setter
| * | adding ability for listeners to be filtered by regular expressions and a ↵SignpostMarv2012-10-261-19/+110
| | | | | | | | | | | | 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-3/+3
| | | | | | | | | | | | OSSL to get git diff to not complain
* | | Merge branch 'master' into careminsterMelanie2012-10-201-1/+1
|\ \ \ | |/ /
| * | minor: comment out currently unused logger in DynamicTextureModuleJustin Clark-Casey (justincc)2012-10-191-1/+1
| | |
| * | Revert "Added request.Proxy=null everywhere, as discussed in ↵Diva Canto2012-09-303-9/+5
| | | | | | | | | | | | | | | | | | | | | | | | http://stackoverflow.com/questions/2519655/httpwebrequest-is-extremely-slow." But the patch is here, in case anyone wants to try it. This reverts commit 531edd51d82ecd6a842a2611c99e9919634491ef.
| * | Added request.Proxy=null everywhere, as discussed in ↵Diva Canto2012-09-303-5/+9
| | | | | | | | | | | | | | | | | | http://stackoverflow.com/questions/2519655/httpwebrequest-is-extremely-slow. Thanks R.Gunther (rigun@rigutech.nl) https://lists.berlios.de/pipermail/opensim-users/2012-September/010986.html
* | | Merge branch 'master' into careminsterMelanie2012-09-291-6/+11
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: CONTRIBUTORS.txt OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
| * | Lock GDI+ portion og VectorRenderModule.GetDrawStringSize() to prevent ↵Justin Clark-Casey (justincc)2012-09-281-6/+11
| | | | | | | | | | | | | | | | | | concurrent thread use provoking mono crashes. Same rationale as commit 13690582.
* | | Merge branch 'avination' into careminsterMelanie2012-09-271-1/+1
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * | just remove the damm thingUbitUmarov2012-09-261-1/+1
| | |
| * | Seems nothing actually need the request body for getevents. so changeUbitUmarov2012-09-261-1/+0
| | | | | | | | | | | | control flag to false
| * | UriModule GetEvents also doesn't need a request bodyUbitUmarov2012-09-261-0/+1
| | |
* | | Merge branch 'master' into careminsterMelanie2012-09-241-0/+367
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * | Moving ScriptModuleComms into the CoreModules tree.Mic Bowman2012-09-171-0/+367
| | |
* | | Merge branch 'avination' into careminsterMelanie2012-09-101-6/+6
|\ \ \ | | |/ | |/|
| * | Remove debug spamMelanie2012-09-041-6/+6
| | |
* | | Merge branch 'master' into careminsterMelanie2012-09-075-43/+218
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs OpenSim/Framework/Servers/VersionInfo.cs
| * | Add missing DynamicTexture.cs file from last commitJustin Clark-Casey (justincc)2012-09-061-0/+61
| | |
| * | If reusing dynamic textures, do not reuse small data length textures that ↵Justin Clark-Casey (justincc)2012-09-064-41/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | If the GetTexture capability receives a request for a range of data beyond ↵Justin Clark-Casey (justincc)2012-09-062-3/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | that of an otherwise valid asset, return HTTP PartialContent rather than RequestedRangeNotSatisfiable. This is because recent viewers (3.2.1, 3.3.4) and probably earlier ones using the http GetTexture capability will sometimes make such invalid range requests. This appears to happen if the viewer's estimate of texture sizes at discard levels > 0 (chiefly 2) exceeds the total texture size. I believe this does not normally happen but can occur for dynamic textures with are large but mainly blank. If this happens, returning a RequestedRangeNotSatisfiable will cause the viewer to not render the texture at the final resolution. However, returning a PartialContent (or OK) even with 0 data will allow the viewer to render the final texture.
* | | Merge branch 'master' into careminsterMelanie2012-08-312-44/+80
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | 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
| * | Make ReuseDynamicTextures an experimental config setting in [Textures]. ↵Justin Clark-Casey (justincc)2012-08-301-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Default is false, as before. If true, this setting reuses dynamically generated textures (i.e. created through osSetDynamicTextureData() and similar OSSL functions) where possible rather than always regenerating them. This results in much quicker updates viewer-side but may bloat the asset cache (though this is fixable). Also, sometimes issue have been seen where dynamic textures do not transfer to the viewer properly (permanently blurry). If this happens and that flag is set then they are not regenerated, the viewer has to clear cache or wait for 24 hours before all cached uuids are invalidated. CUrrently experimental. Default is false, as before.
| * | If the compile-time DynamicTextureModule.ReuseTextures flag is set, check ↵Justin Clark-Casey (justincc)2012-08-301-43/+59
| | | | | | | | | | | | metadata still exists for any reused asset in case some other process has removed it from the cache.
| * | This partially implements the LSL function to set the responseMic Bowman2012-08-291-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | 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-294-70/+410
|\ \ \ | |/ / | | | | | | | | | | | | 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-284-55/+297
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-282-6/+7
| | | | | | | | | | | | Remove mismatching ConvertStream() where there is no AsyncConvertStream and neither IDynamicTextureManager implementer implements this method.