aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'avination' into careminsterMelanie2012-10-181-8/+20
|\ | | | | | | | | | | Conflicts: OpenSim/Framework/WebUtil.cs OpenSim/Region/Physics/OdePlugin/OdeScene.cs
| * make sure a buffer is closed, and changed a misleading log msgUbitUmarov2012-10-051-8/+20
| |
* | Merge branch 'master' into careminsterMelanie2012-10-181-0/+15
|\ \ | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
| * | minor: move recent OnAgentUpdate/OnPreAgentUpdate event doc up into ↵Justin Clark-Casey (justincc)2012-10-181-0/+15
| | | | | | | | | | | | IClientAPI from LLClientView
* | | Merge branch 'master' into careminsterMelanie2012-10-172-10/+23
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Framework/Monitoring/BaseStatsCollector.cs
| * | Add LastMemoryChurn stat using existing data so we can more quickly tell how ↵Justin Clark-Casey (justincc)2012-10-162-2/+14
| | | | | | | | | | | | memory churn changes rather than waiting for the average to move.
* | | Merge branch 'master' into careminsterMelanie2012-10-171-0/+76
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
| * | Add optional pool for the UDPPacketBuffer objects that handle all incoming ↵Justin Clark-Casey (justincc)2012-10-161-0/+76
| | | | | | | | | | | | | | | | | | | | | | | | UDP data. Even when an avatar is standing still, it's sending in a constant stream of AgentUpdate packets that the client creates new UDPPacketBuffer objects to handle. This option pools those objects. This reduces memory churn. Currently off by default. Works but the scope can be expanded.
* | | Fix a merge issueMelanie2012-10-121-5/+5
| | |
* | | Merge branch 'master' into careminsterMelanie2012-10-126-56/+273
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * | Get Watchdog to log thread removalJustin Clark-Casey (justincc)2012-10-121-1/+19
| | |
| * | Fix percentage stats to multiply by 100. Adjust container name for ↵Justin Clark-Casey (justincc)2012-10-121-2/+2
| | | | | | | | | | | | packetpool stats.
| * | Fix build break by moving OpenSim.Framework.Console back below HttpServer in ↵Justin Clark-Casey (justincc)2012-10-121-2/+1
| | | | | | | | | | | | | | | | | | the build order. Luckily, it turns out Framework.Monitoring doesn't need to reference Console directly.
| * | Fix packetpool for ImprovedTerseObjectUpdate packets.Justin Clark-Casey (justincc)2012-10-111-3/+13
| | | | | | | | | | | | | | | These were neither being returned or in many places reused. Getting packets from a pool rather than deallocating and reallocating reduces memory churn which in turn reduces garbage collection time and frequency.
| * | Extend "show stats" command to "show stats [list|all|<category name>]"Justin Clark-Casey (justincc)2012-10-113-52/+189
| | | | | | | | | | | | | | | | | | 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.
| * | Add "delete object pos <start-coord> to <end-coord>" console command.Justin Clark-Casey (justincc)2012-10-101-2/+2
| | | | | | | | | | | | | | | This allows one to delete objects within a certain volume. See help on console for more details.
| * | minor: Add documentation to IGridService.GetRegionFlags()Justin Clark-Casey (justincc)2012-10-091-0/+1
| | |
| * | Once again, forgot to add a file.Justin Clark-Casey (justincc)2012-10-091-0/+52
| | |
* | | Merge branch 'master' into careminsterMelanie2012-10-074-251/+132
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
| * | On receiving TaskInventoryAccepted with a destination folder in the binary ↵Justin Clark-Casey (justincc)2012-10-061-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bucket slot for RLV, notify the viewer about inventory folder updates. The viewer would not see the folder move without this, either on accept or decline. This commit also updates the TaskInventoryOffered message to better conform with the data LL uses Changes are, agentID is prim owner rather than prim id, agent name is now simply object name rather than name with owner detail, message is just folder name in single quotes, message is not timestamped. However, folder is not renamed "still #RLV/~<name>". Long term solution is probably not to do these operations server-side. Notes will be added to http://opensimulator.org/mantis/view.php?id=6311
| * | Add Vector3.Zero return on TryParseConsoleVector() which fails on mono 2.4.3 ↵Justin Clark-Casey (justincc)2012-10-051-0/+3
| | | | | | | | | | | | but not mono 2.10.9
| * | Add missing ConsoleUtil from last commitJustin Clark-Casey (justincc)2012-10-051-0/+111
| | |
| * | Add "show object pos <start-coord> to <end-coord>" command to simulator console.Justin Clark-Casey (justincc)2012-10-051-0/+13
| | | | | | | | | | | | | | | | | | This allows you to display details of all objects in a given bounding box. Values parts of the co-ord can be left out as appropriate (e.g. to get all objects between the ground and z=30. See "help show object pos" for more details.
| * | refactor: Move OpenSim.Framework.PacketPool to ↵Justin Clark-Casey (justincc)2012-10-051-247/+0
| | | | | | | | | | | | | | | | | | | | | OpenSim.Region.Clientstack.Linden.UDP This is to allow it to use OpenSim.Framework.Monitoring in the future. This is also a better location since the packet pool is linden udp specific
* | | Merge branch 'master' into careminsterMelanie2012-10-042-2/+156
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
| * | Add generic PercentageStat.Justin Clark-Casey (justincc)2012-10-041-2/+33
| | | | | | | | | | | | Not yet used.
| * | Add experimental "slow frames" stat, available in "show stats" and via the ↵Justin Clark-Casey (justincc)2012-10-042-2/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | monitoring module. This increments a SlowFrames counter if a frame takes over 120% of maximum time. This commit also introduces a generic OpenSim.Framework.Monitoring.Stat which is available to any code that wants to register a statistic. This is more granualar than asking objects to create their own reports. At some point this will supersede earlier IMonitor and IAlert facilities in MonitoringModule which are only available to scene code.
| * | Allow setting connection limits, part 2Melanie2012-09-301-1/+26
| | |
| * | Allow setting max connections for an endpointMelanie2012-09-301-1/+1
| | |
| * | Revert "Added request.Proxy=null everywhere, as discussed in ↵Diva Canto2012-09-308-14/+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-308-0/+14
| | | | | | | | | | | | | | | | | | 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-277-50/+52
|\ \ \ | | |/ | |/| | | | | | | | | | 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
| * | add assettype mesh to list of binary assetsUbitUmarov2012-09-261-1/+2
| | |
| * | missing fileUbitUmarov2012-09-261-1/+1
| | |
| * | just remove the damm thingUbitUmarov2012-09-263-25/+3
| | |
| * | Seems nothing actually need the request body for getevents. so changeUbitUmarov2012-09-262-3/+10
| | | | | | | | | | | | control flag to false
| * | keep watchdog happy using it to kill his threadsUbitUmarov2012-09-261-9/+1
| | |
| * | more changes to PollServiceUbitUmarov2012-09-262-24/+18
| | |
| * | fix priorityQueue to correctly use the fairness counts starting at 8 forUbitUmarov2012-09-261-10/+10
| | | | | | | | | | | | | | | nonimediate queues. Imediate queues where not taken into account so it was unused.
| * | add missing transactionID in SendInventoryItemCreateUpdate. and make useUbitUmarov2012-09-241-0/+1
| | | | | | | | | | | | | | | of it on inventoryAccessModule, etc. Most likelly it's needs where there is a transactionID not zero
| * | Change the poll service to use a thread pool for replies to make sure theMelanie2012-09-231-7/+38
| | | | | | | | | | | | event queues aren't blocked by other traffic.
| * | Catch a nullref in the code to suppress GetTexture warnign spam we can'tMelanie2012-09-161-1/+1
| | | | | | | | | | | | do a thing about anyway.
| * | Sequence/throttle asset retrievals.Melanie2012-09-141-0/+2
| | |
* | | Merge branch 'master' into careminsterMelanie2012-09-246-151/+381
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * | Make BaseHttpServer throws say something useful.Diva Canto2012-09-221-2/+2
| | |