aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Scripting (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-11-234-8/+8
|\ | | | | | | | | | | | | | | | | Conflicts: .gitignore OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs prebuild.xml runprebuild.bat
| * Fix false positive test failure in ↵Justin Clark-Casey (justincc)2013-11-231-2/+2
| | | | | | | | | | | | TestRepeatSameDrawContainingImageReusingTexture() and TestRepeatSameDrawContainingImage() if localhost has a webserver set up. Use 0.0.0.0 instead of localhost
| * refactor: replace verbose checks with String.IsNullOrEmpty where applicable.Justin Clark-Casey (justincc)2013-11-153-6/+6
| | | | | | | | Thanks to Kira for this patch from http://opensimulator.org/mantis/view.php?id=6845
* | Merge branch 'master' into careminsterMelanie2013-08-111-4/+13
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Application/OpenSimBase.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * Better error reporting when registering LSL function extensions (comms module).Robert Adams2013-08-081-4/+13
| | | | | | | | | | | | For unknown reasons, a dynamic function signature cannot have more than 5 parameters. Error message now tells you this fact so you can curse MS and then go change your function definitions.
* | Merge branch 'master' into careminsterMelanie2013-08-071-2/+2
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * Comment out debug log lines about script modules comms for now.Justin Clark-Casey (justincc)2013-08-051-2/+2
| | | | | | | | If this is an issue, could change log4net config instead to allow re-enablement
* | Merge branch 'master' into careminsterMelanie2013-07-241-2/+4
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
| * Add request received/handling stats for caps which are served by http poll ↵Justin Clark-Casey (justincc)2013-07-151-2/+4
| | | | | | | | | | | | | | handlers. This adds explicit cap poll handler supporting to the Caps classes rather than relying on callers to do the complicated coding. Other refactoring was required to get logic into the right places to support this.
* | Merge branch 'master' into careminsterMelanie2013-07-181-0/+198
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs OpenSim/Server/Handlers/Simulation/AgentHandlers.cs OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs OpenSim/Services/HypergridService/UserAgentService.cs
| * minor: remove some regression test logging switches accidentally left ↵Justin Clark-Casey (justincc)2013-07-111-1/+1
| | | | | | | | uncommented.
| * minor: Take out unnecessary clumsy sleep at the end of regression ↵Justin Clark-Casey (justincc)2013-07-111-3/+0
| | | | | | | | | | | | Test404Response(). This wasn't actually necessary in the end but was accidentally left in.
| * Fix regression where llHTTPRequests which did not get an OK response ↵Justin Clark-Casey (justincc)2013-07-112-40/+238
| | | | | | | | | | | | | | | | returned 499 and the exception message in the http_response event rather than the actual response code and body. This was a regression since commit 831e4c3 (Thu Apr 4 00:36:15 2013) This commit also adds a regression test for this case, though this currently only works with Mono This aims to address http://opensimulator.org/mantis/view.php?id=6704
| * Supply proper type information for the various types of requestsMelanie2013-06-071-6/+6
| |
| * Adding Avination's PollService to round out the HTTP inventory changesMelanie2013-06-071-4/+4
| |
* | Merge branch 'avination-current' into careminsterMelanie2013-06-061-1/+50
|\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs OpenSim/Region/Framework/Interfaces/IDynamicMenuModule.cs OpenSim/Region/OptionalModules/ViewerSupport/DynamicMenuModule.cs OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
| * | Implement llSetContentType using the new OpenID auth support for authenticationMelanie2013-05-051-1/+50
| | |
* | | Merge branch 'master' into careminsterMelanie2013-05-041-1/+1
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Conflicts: OpenSim/Region/Application/OpenSimBase.cs OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
* | | Merge branch 'master' into careminsterMelanie2013-04-101-1/+0
|\ \ \ | |/ / | | / | |/ |/| | | | | Conflicts: OpenSim/Data/MySQL/MySQLAssetData.cs OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
| * minor: fix mono compiler warning in ScriptsHttpRequests.csJustin Clark-Casey (justincc)2013-04-101-1/+0
| |
| * refactor: Simplify ScriptsHttpRequests.GetNextCompletedRequest to more ↵Justin Clark-Casey (justincc)2013-04-041-10/+4
| | | | | | | | simply iterate through pending requests without unnecessary checks.
| * Fix bug where outstanding llHTTPRequests for scripts were not being aborted ↵Justin Clark-Casey (justincc)2013-04-041-30/+62
| | | | | | | | | | | | | | | | | | when they were deleted. This was because AsyncCommandManager was handing an item ID to IHttpRequestModule.StopHttpRequest() rather than the expected request ID. This commit also makes the http request asynchronous using BeginGetResponse() rather than doing this by launching a new thread so that we can more safely abort it via HttpWebRequest.Abort() rather than aborting the thread itself. This also renames StopHttpRequest() to StopHttpRequestsForScript() since any outstanding requests are now aborted and/or removed.
* | Merge branch 'master' into careminsterMelanie2013-03-291-9/+70
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Added missing functionality (mainly custom headers) to llHTTPRequest.Kevin Cozens2013-03-291-9/+64
| |
* | Merge branch 'master' into careminsterMelanie2013-03-131-0/+5
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Tests/SceneObjectUndoRedoTests.cs
| * minor: save some commented out log lines which will be useful again in ↵Justin Clark-Casey (justincc)2013-03-131-0/+5
| | | | | | | | future debugging of VectorRenderModule
* | Merge branch 'avination' into careminsterMelanie2013-03-061-0/+2
|\ \ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
| * | Experimental - add void return support to modSendCommandMelanie2013-03-031-0/+2
| | |
* | | Merge branch 'avination' into careminsterMelanie2013-03-031-1/+7
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
| * | Correctly remove https:// URLs from the http server.Melanie2013-02-171-1/+7
| | |
* | | Merge branch 'master' into careminsterMelanie2013-02-271-9/+17
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
| * | Add regression test for llReleaseUrl() (and for llRequestUrl)Justin Clark-Casey (justincc)2013-02-271-9/+16
| | | | | | | | | | | | Forgot to add file for llRequestUrl() test in commit b8a7c8b
* | | Merge branch 'master' into careminsterMelanie2013-02-272-23/+31
|\ \ \ | |/ / | | | | | | | | | | | | | | | 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-271-6/+10
| | | | | | | | | | | | places where we were not already.
| * | Add regression test for llRequestUrl()Justin Clark-Casey (justincc)2013-02-261-16/+21
| | |
* | | Merge branch 'master' into careminsterMelanie2013-02-151-6/+8
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * | * Handle null check on configs in module startup so that the the code can be ↵teravus2013-02-141-6/+8
| | | | | | | | | | | | run on 'stop on handled and unhandled null reference exceptions' mode without pausing during startup a bunch of times. I don't think exceptions were really meant for replacing a single if statement...
* | | 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
| | |
generated by cgit v1.1 at 2024-12-21 07:45:03 +0000