aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Servers (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-01-232-4/+23
|\
| * Merge branch 'master' of /home/opensim/var/repo/opensimBlueWall2013-01-232-5/+15
| |\
| * | Add additional return statusBlueWall2013-01-232-4/+23
| | | | | | | | | | | | Adding additional return status for JsonRpcMethod. Now returns true/false
* | | Merge branch 'master' into careminsterMelanie2013-01-192-4/+14
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
| * | Explicitly stop PollServiceRequestManager() rather than relying on its ↵Justin Clark-Casey (justincc)2013-01-192-5/+15
| |/ | | | | | | | | | | destructor. Hopes to address occasional shutdown failures from http://opensimulator.org/mantis/view.php?id=6503
* | Merge commit 'f54b398540698e6e09022fe77b6405624b532f5c' into careminsterMelanie2013-01-165-0/+298
|\ \ | |/
| * Add Json-Rpc 2.0 To Registered HandlersBlueWall2013-01-155-0/+298
| | | | | | | | | | Added registration json-rpc handlers in the http server. Covers version 2.0 See: http://www.jsonrpc.org/specification
* | Merge branch 'master' into careminsterMelanie2012-12-071-1/+1
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * In BaseHttpServer.HandleRequest(), use Culture.SetCurrentCulture() rather ↵Justin Clark-Casey (justincc)2012-12-051-1/+1
| | | | | | | | than creating a new CultureInfo separately
* | Merge branch 'master' into careminsterMelanie2012-11-255-176/+116
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
| * Consistenly make NUnit test cases inherit from OpenSimTestCase which ↵Justin Clark-Casey (justincc)2012-11-242-2/+4
| | | | | | | | automatically turns off any logging enabled between tests
| * Make "show threads" and "thread abort" console commands available on all serversJustin Clark-Casey (justincc)2012-11-232-102/+93
| |
| * Make "force gc" console command available across all serversJustin Clark-Casey (justincc)2012-11-232-11/+12
| |
| * Make "show version" console command available across all serversJustin Clark-Casey (justincc)2012-11-232-8/+7
| |
| * Delete unused BaseHttpServer.HandleAgentRequest()Justin Clark-Casey (justincc)2012-11-231-53/+0
| |
* | Merge branch 'master' into careminsterMelanie2012-11-222-332/+547
|\ \ | |/
| * Factor out command script code.Justin Clark-Casey (justincc)2012-11-221-2/+50
| | | | | | | | This also allows comments in command scripts (lines starting with ;, # or //) to be used across all servers
| * Make "config show/set/get/save" console commands available on all serversJustin Clark-Casey (justincc)2012-11-221-3/+137
| |
| * Factor out common pid file creation and removal code.Justin Clark-Casey (justincc)2012-11-222-40/+47
| | | | | | | | Log path at which pid file is created or reason for failure to create.
| * Add "get log level" command - this returns the current server session ↵Justin Clark-Casey (justincc)2012-11-221-19/+31
| | | | | | | | | | | | console logging level. This supersedes getting information by calling "set log level" without a 4th argument, which is confusing.
| * Remove unused BaseOpenSimServer.ShowHelp()Justin Clark-Casey (justincc)2012-11-221-21/+0
| |
| * Make "set log level" command available across all serversJustin Clark-Casey (justincc)2012-11-222-31/+31
| |
| * Make "show info" command available across all serversJustin Clark-Casey (justincc)2012-11-222-179/+183
| | | | | | | | This helpfully lists version information, startup location and console log level
| * Factor out common registration of "show uptime" commandJustin Clark-Casey (justincc)2012-11-222-66/+76
| |
| * factor out common HandleShow code for "show uptime"Justin Clark-Casey (justincc)2012-11-222-34/+55
| |
* | Merge branch 'master' into careminsterMelanie2012-11-222-25/+62
|\ \ | |/
| * refactor: Factor out copy/pasted server uptime report codeJustin Clark-Casey (justincc)2012-11-222-25/+62
| |
* | Merge branch 'master' into careminsterMelanie2012-11-201-2/+5
|\ \ | |/
| * minor: If logging full incoming HTTP data, don't deceptively print ... at ↵Justin Clark-Casey (justincc)2012-11-201-2/+5
| | | | | | | | the end of the body.
* | Merge commit '619c39e5144f15aca129d6d999bcc5c34133ee64' into careminsterMelanie2012-11-201-1/+2
|\ \ | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs
| * | * Prep work switching the GetMeshModule over to a poll service.teravus2012-11-091-1/+2
| | | | | | | | | | | | * This still has the image throttler in it.. as is... so it's not suitable for live yet.... The throttler keeps track of the task throttle but doesn't balance the UDP throttle yet.
* | | Merge branch 'master' into careminsterMelanie2012-11-152-0/+66
|\ \ \ | | |/ | |/|
| * | A few more AssemblyInfos in a few more dlls.Diva Canto2012-11-142-0/+66
| | |
* | | Merge branch 'master' into careminsterMelanie2012-10-301-0/+11
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | Add "force gc" region console command which manually invokes garbage collection.Justin Clark-Casey (justincc)2012-10-291-0/+11
| | | | | | | | | | | | For debugging purposes.
* | | Merge branch 'master' into careminsterMelanie2012-10-231-9/+3
|\ \ \ | |/ /
| * | minor: Get content type handler logger to log "unset" for the content type ↵Justin Clark-Casey (justincc)2012-10-231-1/+1
| | | | | | | | | | | | instead of blank if no content type was set.
| * | minor: Use LogIncomingToContentTypeHandler() method for incoming HTTP data ↵Justin Clark-Casey (justincc)2012-10-231-8/+2
| | | | | | | | | | | | | | | | | | where this wasn't already used. This allows log level 5 (log sample or large part of incoming post data) to operate and removes copy/paste.
| * | If we're avoiding printing a long request warning for a GetTexture CAP call, ↵Justin Clark-Casey (justincc)2012-10-181-1/+1
| | | | | | | | | | | | | | | | | | check we received a request handler first since this is not guaranteed. Resolves harmless logged exception when content type and generic xml rpc requests take more than 3 seconds.
* | | Merge branch 'master' into careminsterMelanie2012-10-121-28/+4
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * | Extend "show stats" command to "show stats [list|all|<category name>]"Justin Clark-Casey (justincc)2012-10-111-28/+4
| | | | | | | | | | | | | | | | | | This allows different categories of stats to be shown, with options to list categories or show all stats. Currently categories are scene and simulator and only a very few stats are currently registered via this mechanism. This commit also adds percentage stats for packets and blocks reused from the packet pool.
| * | Allow setting max connections for an endpointMelanie2012-09-301-1/+1
| | |
| * | Revert "Added request.Proxy=null everywhere, as discussed in ↵Diva Canto2012-09-303-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | 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-0/+4
| | | | | | | | | | | | | | | | | | 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 'avination' into careminsterMelanie2012-09-291-0/+4
|\ \ \ | | |/ | |/|
| * | Update the Http server with a few additional properties. Adapt the testMelanie2012-09-271-0/+4
| | | | | | | | | | | | server code to match.
* | | Merge branch 'master' into careminsterMelanie2012-09-292-5/+5
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Conflicts: CONTRIBUTORS.txt OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
| * | Fix bug where debug http level 6 could not be specified. Also converts ↵Justin Clark-Casey (justincc)2012-09-292-5/+5
| | | | | | | | | | | | newlines at this level to '\n' to enable them to be logged.
* | | Merge branch 'avination' into careminsterMelanie2012-09-273-38/+38
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * | create a new PollServiceHttpRequest req per loop since they can be sent toUbitUmarov2012-09-271-5/+1
| | | | | | | | | | | | another working thread
generated by cgit v1.1 at 2024-10-23 23:25:38 +0000