| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Catch a nullref in the code to suppress GetTexture warnign spam we can't | Melanie | 2012-09-16 | 1 | -1/+1 |
| | | | | | do a thing about anyway. | ||||
| * | Sequence/throttle asset retrievals. | Melanie | 2012-09-14 | 1 | -0/+2 |
| | | |||||
| * | Revamp the HTTP textures handler to allow a maximum of four fetches | Melanie | 2012-09-14 | 1 | -14/+33 |
| | | | | | at any time and to drop requests for avatars n longer in the scene | ||||
| * | Allow setting max connections for an endpoint | Melanie | 2012-09-14 | 1 | -1/+1 |
| | | |||||
| * | add a extra httppool thread to compensate for webfetchinventory | UbitUmarov | 2012-09-10 | 1 | -1/+2 |
| | | |||||
| * | Merge branch 'master' into careminster | Melanie | 2012-07-28 | 1 | -0/+1 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Monitoring/BaseStatsCollector.cs OpenSim/Region/Application/OpenSim.cs OpenSim/Region/Application/OpenSimBase.cs OpenSim/Region/Framework/Scenes/SceneManager.cs bin/OpenMetaverse.Rendering.Meshmerizer.dll bin/OpenMetaverse.StructuredData.dll bin/OpenMetaverse.dll bin/OpenMetaverseTypes.dll prebuild.xml | ||||
| | * | Move Watchdog and MemoryWatchdog classes into OpenSim.Framework.Monitoring ↵ | Justin Clark-Casey (justincc) | 2012-07-25 | 1 | -0/+1 |
| | | | | | | | | | with other monitoring code from OpenSim.Framework | ||||
| * | | Merge branch 'avination' into careminster | Melanie | 2012-07-16 | 1 | -1/+3 |
| |\ \ | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/Scene.cs | ||||
| | * | | Eliminate a spurious exception report when a https url is accessed with a wrong | Melanie | 2012-07-15 | 1 | -0/+2 |
| | | | | | | | | | | | | | CN | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-06-15 | 1 | -13/+27 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | Make the "debug http" command available for robust as well as the simulator. ↵ | Justin Clark-Casey (justincc) | 2012-06-15 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | This allows one to see incoming requests as they happen. This required making everything use the common MainServer class for registering and retrieving http servers, rather than duplicate structures. | ||||
| | * | | Add main instance to internal MainServer.m_Servers list to simplify internal ↵ | Justin Clark-Casey (justincc) | 2012-06-15 | 1 | -8/+0 |
| | | | | | | | | | | | | | | | | | | | logic. This does require the server to be added before it is set as the main Instance | ||||
| | * | | When setting debug http level, do this for all known http servers, not just ↵ | Justin Clark-Casey (justincc) | 2012-06-15 | 1 | -10/+10 |
| | | | | | | | | | | | | | the main instance. | ||||
| | * | | Shuffle "debug http" levels so that 1 and 2 now cause different levels of ↵ | Justin Clark-Casey (justincc) | 2012-06-14 | 1 | -8/+27 |
| | | | | | | | | | | | | | warn to be logged if we receive invalid xml for xmlrpc. | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-06-15 | 1 | -1/+1 |
| |\ \ \ | |/ / | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | ||||
| | * | | Fix a regression in BaseHttpServer.HandleXmlRpcRequests() from recent c6e3752 | Justin Clark-Casey (justincc) | 2012-06-14 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Accidentally make responseString null by default instead of String.Empty. It needs to be something in case the XmlRpcRequest deserialize throws an exception due to bad xml (a failure which we silently swallow!) | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-06-13 | 1 | -296/+116 |
| |\ \ \ | |/ / | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | ||||
| | * | | Don't include time to transmit response back to requester when assessing ↵ | Justin Clark-Casey (justincc) | 2012-06-13 | 1 | -297/+116 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | slow handling of requests. This is to avoid logging a 'slow' request when the source of delay is the viewer in processing a response. This is not something we can do much about on the server end - it's server-side delay that we're interested in. To ensure consistency, this commit also had to refactor and simplify inbound non-poll network request handling, though there should be no functional change. IOSHttpResponse no longer exposes the Send() method, only classes in OpenSim.Framework.Servers.HttpServer should be doing this. Only the GetTextureHandler was sending its own response. Now it leaves this to BaseHttpServer, like all other core handlers. | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-05-10 | 1 | -2/+2 |
| |\ \ \ | |/ / | |||||
| | * | | Improve logging on the prim inventory script asset request path for future use. | Justin Clark-Casey (justincc) | 2012-05-09 | 1 | -2/+2 |
| | | | | | | | | | | | | | This adds name and description of the request handler to http request logging when DebugLevel >= 1 | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-05-08 | 1 | -19/+19 |
| |\ \ \ | |/ / | |||||
| | * | | Log the full exception when errors occur in BaseHttpServer | Oren Hurvitz | 2012-05-07 | 1 | -19/+19 |
| | | | | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-05-05 | 1 | -4/+12 |
| |\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/WebUtil.cs OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| | * | | minor: Tweak BaseHttpServer message to make it clear that this relates to ↵ | Justin Clark-Casey (justincc) | 2012-05-04 | 1 | -1/+1 |
| | | | | | | | | | | | | | slow handling of inbound requests. | ||||
| | * | | Implement optional name and description on http stream handlers so that we ↵ | Justin Clark-Casey (justincc) | 2012-05-03 | 1 | -4/+12 |
| | | | | | | | | | | | | | | | | | | | can relate a slow request to what the handler actually does and the agent it serves, if applicable. This is most useful for capabilities where the url is not self-describing. | ||||
| | * | | Revert "Log the full exception when errors occur in BaseHttpServer" | Justin Clark-Casey (justincc) | 2012-04-27 | 1 | -19/+19 |
| | | | | | | | | | | | | | | | | | | | This reverts commit e31e7c68c8abfd61fed6dabac5403d8adf42ae87. Applied for patch assessment and accidentally committed too early. | ||||
| | * | | Log the full exception when errors occur in BaseHttpServer | Oren Hurvitz | 2012-04-27 | 1 | -19/+19 |
| | | | | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-04-20 | 1 | -2/+2 |
| |\ \ \ | |/ / | | / | |/ |/| | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs | ||||
| | * | Add more exception detail to Exception and IOException throws in ↵ | Justin Clark-Casey (justincc) | 2012-04-20 | 1 | -2/+2 |
| | | | | | | | | | BaseHttpServer.HandleRequest() | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-04-07 | 1 | -2/+2 |
| |\ \ | |/ | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/CoreModules/World/Land/LandObject.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| | * | Thank you, BaseHttpServer, for telling me where things go wrong. | Diva Canto | 2012-04-06 | 1 | -2/+2 |
| | | | |||||
| * | | Merge commit 'eda770e978c09c756d15ba62dbbf6ee34a61b2f5' into bigmerge | Melanie | 2011-12-08 | 1 | -9/+3 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | ||||
| | * | Stop also adding an ordinary http handler when we set up a poll http handler. | Justin Clark-Casey (justincc) | 2011-12-07 | 1 | -9/+3 |
| | | | | | | | | | It appears that this is entirely unnecessary since the poll http handlers are dealt with on a separate code path. | ||||
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-12-01 | 1 | -15/+48 |
| |\ \ | |/ | |||||
| | * | On "show caps", stop excluding the seed cap but do exclude it elsewhere | Justin Clark-Casey (justincc) | 2011-11-29 | 1 | -1/+3 |
| | | | |||||
| | * | With "debug http 1", show the path with the query string instead of just the ↵ | Justin Clark-Casey (justincc) | 2011-11-29 | 1 | -21/+21 |
| | | | | | | | | | | | | | path. Also simplifies debug levels to just 0 and 1 | ||||
| | * | Add "debug http" command for currently simple extra debug logging of ↵ | Justin Clark-Casey (justincc) | 2011-11-29 | 1 | -12/+43 |
| | | | | | | | | | non-event queue inbound http requests to a simulator | ||||
| * | | Merge commit 'e14cb45b9bc4c78300cb804833cb66c1c2e62187' into bigmerge | Melanie | 2011-10-25 | 1 | -12/+2 |
| |\ \ | |/ | |||||
| | * | Drop some unnecessary ContainsKey() checking before Remove() in BaseHttpServer() | Justin Clark-Casey (justincc) | 2011-10-24 | 1 | -12/+2 |
| | | | | | | | | | Remove() presumably does this check anyway since it just returns false if the key is not in the collection. | ||||
| * | | Merge commit '9ec672c70b28b8c1d6d81bab7744fcf7bf9b83c7' into bigmerge | Melanie | 2011-10-25 | 1 | -2/+2 |
| |\ \ | |/ | |||||
| | * | Fix bugs in EventQueueGetModule.ClientClosed() and ↵ | Justin Clark-Casey (justincc) | 2011-10-24 | 1 | -2/+2 |
| | | | | | | | | | | | | | BaseHttpServer.RemovePollServerHTTPHandler() that stopped existing code in ClientClosed() from actually tearing down the poll handler Actually doing the tear down appear to have no ill effects with region crossing and teleport. | ||||
| * | | Merge commit 'e742cffe15d3e50841908d7babc2e4c4a7630635' into bigmerge | Melanie | 2011-10-11 | 1 | -1/+1 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | ||||
| | * | Add Enabled switch in new [Attachments] section in OpenSimDefaults.ini to ↵ | Justin Clark-Casey (justincc) | 2011-09-30 | 1 | -1/+1 |
| | | | | | | | | | | | | | allow attachments to be temporarily turned off. This is for debugging purposes. Defaults to Attachments Enabled | ||||
| * | | Resolve merge commits, stage 1 | Tom | 2011-09-04 | 1 | -57/+55 |
| |\ \ | |/ | |||||
| | * | read m_rpcHandlersKeepAlive under appropriate lock | Justin Clark-Casey (justincc) | 2011-08-22 | 1 | -2/+4 |
| | | | |||||
| | * | oops, fix build break from last commit | Justin Clark-Casey (justincc) | 2011-08-22 | 1 | -12/+8 |
| | | | |||||
| | * | improve locking of m_agentHandlers in BaseHttpServer | Justin Clark-Casey (justincc) | 2011-08-22 | 1 | -10/+10 |
| | | | |||||
| | * | improve locking of m_HTTPHandlers in BaseHttpServer | Justin Clark-Casey (justincc) | 2011-08-22 | 1 | -2/+2 |
| | | | |||||
| | * | improve locking of m_streamHandlers in BaseHttpServer | Justin Clark-Casey (justincc) | 2011-08-22 | 1 | -2/+4 |
| | | | |||||
| | * | remove necessity to catch a KeyNotFoundException in ↵ | Justin Clark-Casey (justincc) | 2011-08-22 | 1 | -11/+6 |
| | | | | | | | | | BaseHttpServer.RemoveLLSDHandler() | ||||
 |
index : opensim-SC_OLD | |
| My fork of OpenSim for IG and MG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |