aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-07-1817-27/+217
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Authenticate ChildAgentUpdate too.Diva Canto2013-07-142-2/+3
| |
| * Add ToOSDMap() overrides to the Stat subclass CounterStat.Robert Adams2013-07-123-0/+88
| | | | | | | | | | Add a GetStatsAsOSDMap method to StatsManager which allows the filtered fetching of stats for eventual returning over the internets.
| * Fix regression where llHTTPRequests which did not get an OK response ↵Justin Clark-Casey (justincc)2013-07-111-1/+6
| | | | | | | | | | | | | | | | 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
| * Added show client-stats [first last] command to expose what viewers are ↵Diva Canto2013-07-101-3/+8
| | | | | | | | requesting.
| * Add missing file BaseOutputStreamHandler.cs from recent commit e19defdJustin Clark-Casey (justincc)2013-07-081-0/+60
| |
| * minor: remove now unused migration-hack bool from DAMapJustin Clark-Casey (justincc)2013-07-081-4/+0
| |
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-07-081-1/+1
| |\
| | * BaseHttpServer: if the handler sets the content length, don't override it. ↵Diva Canto2013-07-081-1/+1
| | | | | | | | | | | | This happens in HEAD handlers.
| * | Add "show caps stats by user" and "show caps stats by cap" console commands ↵Justin Clark-Casey (justincc)2013-07-087-16/+51
| |/ | | | | | | | | | | | | | | | | to print various counts of capability invocation by user and by cap This currently prints caps requests received and handled, so that overload of received compared to handled or deadlock can be detected. This involves making BaseStreamHandler and BaseOutputStream record the ints, which means inheritors should subclass ProcessRequest() instead of Handle() However, existing inheriting classes overriding Handle() will still work, albeit without stats recording. "show caps" becomes "show caps list" to disambiguate between show caps commands
| * Revert "WARNING: BRUTE FORCE DEBUG. AVOID USING THIS COMMIT."Diva Canto2013-07-041-4/+0
| | | | | | | | This reverts commit c95a23863ab51810ccc01afd3dd641c18a183305.
| * WARNING: BRUTE FORCE DEBUG. AVOID USING THIS COMMIT.Diva Canto2013-07-041-0/+4
| |
* | Merge branch 'master' into careminsterMelanie2013-06-303-125/+192
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Region/Framework/Scenes/EventManager.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
| * Changed HG status notifications timeout down to 15secs from the default 100.Diva Canto2013-06-291-1/+9
| |
| * Remove hack to migrate previous experimental-level os materials data.Justin Clark-Casey (justincc)2013-06-291-9/+0
| | | | | | | | This didn't seem to be working anyway and it's better not to have such hacks in the code for experimental stuff.
| * add method docs for DAMap.GetStore() and DAMap.SetStore()dahlia2013-06-271-0/+12
| |
| * Make the concept of namespaces explicit in dynamic attributesJustin Clark-Casey (justincc)2013-06-272-126/+182
| | | | | | | | | | | | | | | | This is in order to reduce the likelihood of naming clashes, make it easier to filter in/out attributes, ensure uniformity, etc. All dynattrs in the opensim distro itself or likely future ones should be in the "OpenSim" namespace. This does alter the underlying dynattrs data structure. All data in previous structures may not be available, though old structures should not cause errors. This is done without notice since this feature has been explicitly labelled as experimental, subject to change and has not been in a release. However, existing materials data is being preserved by moving it to the "Materials" store in the "OpenSim" namespace.
* | Merge branch 'master' into careminsterMelanie2013-06-2310-185/+635
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Framework/Monitoring/BaseStatsCollector.cs OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
| * minor: remove mono compiler warnings in WebsocketServerHandler.csJustin Clark-Casey (justincc)2013-06-201-13/+7
| |
| * Change "ObjectMemory" stat to "HeapMemory" to align with other stat names. ↵Justin Clark-Casey (justincc)2013-06-201-3/+3
| | | | | | | | | | | | Also round this and ProcessMemory to three decimal places in common with other memory stats. I believe leaving out such minor info makes stats easier to read
| * Allow more than one stat category to be specified in "show stats"Justin Clark-Casey (justincc)2013-06-201-30/+34
| | | | | | | | e.g. "show stats httpserver.9000 server.network"
| * minor: Change "memory churn" terminology in statistics to "heap allocation ↵Justin Clark-Casey (justincc)2013-06-203-14/+14
| | | | | | | | rate" since this is more generally meaningful
| * Fix minor bug where the check whether to display SmartThreadPool stats was ↵Justin Clark-Casey (justincc)2013-06-201-1/+1
| | | | | | | | | | | | accidentally != null rather than == FireAndForgetMethod.SmartThreadPool Due to another check this had no practical effect
| * Make it possible to specify display of stats in a particular 'container' by ↵Justin Clark-Casey (justincc)2013-06-202-3/+17
| | | | | | | | | | | | | | | | | | separating category and container with a period. e.g. "show stats server.network" I failed to realize this had already been implemented without the period in the show stats command (as the command help had not been updated). However, I would prefer the . approach as it will allow specifying multiple stats, easier wildcarding, etc. This commit also prevents any stat from having a period in its short name.
| * Display existing statistic of how many http requests a server is making as ↵Justin Clark-Casey (justincc)2013-06-193-5/+23
| | | | | | | | server.network.HTTPRequestsMade in "show stats all"
| * minor: tidy up spacing if display a unit for additional stat informationJustin Clark-Casey (justincc)2013-06-181-1/+1
| |
| * Make number of inbound http requests handled available as a ↵Justin Clark-Casey (justincc)2013-06-182-6/+31
| | | | | | | | httpserver.<port>.IncomingHTTPRequestsProcessed stat
| * Fix issue where stat samples were accidentally static, so that any ↵Justin Clark-Casey (justincc)2013-06-181-1/+1
| | | | | | | | additional stat with sampling would produce wrong results
| * If SmartThreadPool is active, display statistical information about it in ↵Justin Clark-Casey (justincc)2013-06-181-2/+13
| | | | | | | | | | | | "show stats server" Also puts these and previous builtin threadpool stats in the "threadpool" stat container rather than "processor"
| * refactor: Move existing code to generate report information on the ↵Justin Clark-Casey (justincc)2013-06-172-64/+103
| | | | | | | | threadpool to the ServerBase rather than being in Util
| * Fix bug where no threadpool data would be displayed in the "show threads" ↵Justin Clark-Casey (justincc)2013-06-171-1/+1
| | | | | | | | command if threadpool type was QueueUserWorkItem (Unsafe worked as expected)
| * Drop server level stats to debug instead of info.Justin Clark-Casey (justincc)2013-06-171-1/+1
| | | | | | | | | | | | This was the original intention with these stats, as I didn't believe they would be useful to ordinary users if everything is working as it should. Please amend if this is an issue. Just for now, levels actually have no impact on what is displayed via the "show stats" command.
| * Add server stats for available builtin threadpool and iocp workersJustin Clark-Casey (justincc)2013-06-171-0/+16
| |
| * Make general server stats available on the robust console as well as the ↵Justin Clark-Casey (justincc)2013-06-174-65/+394
| | | | | | | | | | | | simulator console This means the "show stats" command is now active on the robust console.
* | Merge branch 'avination-current' into careminsterMelanie2013-06-231-1/+1
|\ \ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
| * | Add a result param to te money module interfaceMelanie2013-06-131-1/+1
| | |
* | | Merge branch 'master' into careminsterMelanie2013-06-133-8/+59
|\ \ \ | | |/ | |/|
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-06-121-3/+2
| |\ \
| | * | Add TriggerScenePresenceUpdated events when an animation is addedRobert Adams2013-06-111-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | or removed. Shouldn't impact anyone as only DSG seems to use OnScenePresenceUpdated event. Some minor format changes to AnimationSet's ToString().
| * | | Implement logging of first 80 characters (debug level 5) or full body data ↵Justin Clark-Casey (justincc)2013-06-122-5/+57
| |/ / | | | | | | | | | | | | | | | | | | (debug level 6) on outgoing requests, depending on debug level This is set via "debug http out <level>" This matches the existing debug level behaviours for logging incoming http data
* | | Merge branch 'avination-current' into careminsterMelanie2013-06-112-319/+0
|\ \ \ | | |/ | |/|
| * | Clean up poll serviceMelanie2013-06-072-319/+0
| | |
* | | Merge branch 'master' into careminsterMelanie2013-06-112-7/+9
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Conflicts: OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
| * | Add port numbers to poll service thread names so that we can tell which ↵Justin Clark-Casey (justincc)2013-06-101-2/+2
| | | | | | | | | | | | belong to which HttpServer
| * | Reinstate explicit starting and stopping of PollServiceRequestManager added ↵Justin Clark-Casey (justincc)2013-06-102-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | in 3eee991 but removed in 7c0bfca Do not rely on destructors to stop things. These fire at unpredictable times and cause problems such as http://opensimulator.org/mantis/view.php?id=6503 and most probably http://opensimulator.org/mantis/view.php?id=6668
| * | Supply proper type information for the various types of requestsMelanie2013-06-071-3/+1
| | |
| * | Adding Avination's PollService to round out the HTTP inventory changesMelanie2013-06-075-228/+211
| | |
| * | Port Avination's inventory send throttlingMelanie2013-06-051-0/+108
| | |
* | | Merge branch 'avination-current' into careminsterMelanie2013-06-061-1/+1
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | 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
| * | Update the money framework to allow sending the new style linden "serverside ↵Melanie2013-05-252-4/+4
| | | | | | | | | | | | | | | | | | is now viewerside" messages regarding currency This will require all money modules to be refactored!
generated by cgit v1.1 at 2024-11-06 03:30:01 +0000