aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Scripting (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-01-261-1/+1
|\
| * Add basic JsonCreateStore() regression testJustin Clark-Casey (justincc)2013-01-251-1/+1
| |
* | Merge branch 'master' into careminsterMelanie2013-01-251-0/+15
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
| * Mantis 6508 llHTTPResponse body is incorrectly interpreted by IETalun2013-01-241-1/+15
| | | | | | | | | | | | | | | | | | This patch html escapes responses going to IE so that they cannot be interpreted as HTML if the response type is "text/plain". This has no effect if the reponse type has been set to "text/html" by osSetContentType Signed-off-by: nebadon <michael@osgrid.org>
* | Null check the response body to make sure we're not crashing the script engineMelanie2013-01-241-0/+6
| |
* | Implement HTTP Request froma thread pool to avoid packet congestionMelanie2013-01-201-14/+45
| |
* | Revert "Refactor scripted http request to use async calls rather than hard ↵Melanie2013-01-201-87/+53
| | | | | | | | | | | | threads" This reverts commit 461ecd7cf9edebce45ab715901a7f3b02c216e7b.
* | Refactor scripted http request to use async calls rather than hard threadsMelanie2013-01-201-53/+87
| |
* | 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.