aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
* | | 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
| | |
| * | Minor: may avoid crashes of sims that still don't have this configuration ↵Diva Canto2012-09-211-0/+3
| | | | | | | | | | | | section.
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-09-214-113/+136
| |\ \
| | * | minor: Make slow outgoing request log messages consistent with other log ↵Justin Clark-Casey (justincc)2012-09-211-7/+7
| | | | | | | | | | | | | | | | messages
| | * | Comment out the long unused afaik HTTP agent handlers.Justin Clark-Casey (justincc)2012-09-213-87/+87
| | | | | | | | | | | | | | | | | | | | | | | | As far as I know, this was only used by the IBM Rest modules, much of which has been commented out for a very long time now. Other similar code uses HTTP or stream handlers instead. So commenting this out to reduce code complexity and the need to make this facility consistent with the others where it may not be used anyway. If this facility is actually being used then please notify me or uncomment it if you are core.
| | * | Add request number counting to incoming HTTP requests in the same way that ↵Justin Clark-Casey (justincc)2012-09-212-19/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this was already being done for outgoing HTTP requests. This allows us to associate debug logging messages with the right request. It also allows us to put a request number on 'long request' logging even if other debug logging is not enabled, which gives us some idea of whether every request is suffering this problem or only some. This is a separate internal number not associated with any incoming number in the opensim-request-id header, this will be clarified when logging of this incoming request number is re-enabled. This commit also adds port number to HTTP IN logging to allow us to distinguish between different request numbers on different ports.
| * | | Improvement over last commit: refactor the asset permissions code, so that ↵Diva Canto2012-09-201-0/+81
| |/ / | | | | | | | | | it can be used by both the HG Asset Service and the simulator. Also renamed the config vars to something more intuitive
| * | Insert a new log level 4 for HTTP IN and HTTP OUT that will log how long the ↵Justin Clark-Casey (justincc)2012-09-203-32/+87
| | | | | | | | | | | | | | | | | | | | | request took. This is only printed if debug http level >= 4 and the request didn't take more than the time considered 'long', in which case the existing log message is printed. This displaces the previous log levels 4 and 5 which are now 5 and 6 respectively.
| * | Add ability to turn on/off logging of outgoing HTTP requests flowing through ↵Justin Clark-Casey (justincc)2012-09-203-35/+103
| | | | | | | | | | | | | | | | | | | | | | | | | | | WebUtil. This is for debugging purposes. This is controlled via the "debug http" command which can already log incoming requests. This now gains a mandatory parameter of in, out or all to control what is logged. Log messages are also shortened and labelled and HTTP IN or HTTP OUT to be consistent with existing UDP PACKET IN and PACKET OUT messages.
| * | Fix some inconsistencies in configurartion: NonPhys primsBlueWall2012-09-181-4/+4
| | | | | | | | | | | | | | | | | | Fix inconsistencies between configuration parameter names and their description names. Changing the configuration parameters for non physical prim size min-max from Nonphys* to NonPhys*. Please update your OpenSim.ini and Regions.ini to reflect these changes.
* | | Merge branch 'avination' into careminsterMelanie2012-09-164-18/+57
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
| * | Revamp the HTTP textures handler to allow a maximum of four fetchesMelanie2012-09-143-17/+36
| | | | | | | | | | | | at any time and to drop requests for avatars n longer in the scene
| * | Allow setting connection limits, part 2Melanie2012-09-141-0/+20
| | |
| * | Allow setting max connections for an endpointMelanie2012-09-141-1/+1
| | |
* | | Merge branch 'master' into careminsterMelanie2012-09-165-20/+154
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs OpenSim/Region/Framework/Scenes/EventManager.cs
| * | Support multi-region OAR filesOren Hurvitz2012-09-141-0/+5
| | | | | | | | | | | | Merged ArchiveWriteRequestPreparation.cs and ArchiveWriteRequestExecution.cs. This simplifies the code, and it's faster to write each scene to the archive as it's found rather than all at once at the end.
| * | Fix usage statement on "debug http" console command since max level is now 5 ↵Justin Clark-Casey (justincc)2012-09-121-1/+1
| | | | | | | | | | | | rather than 3
| * | Fix bug in logging sample input at debug http level 4.Justin Clark-Casey (justincc)2012-09-121-1/+1
| | | | | | | | | | | | Also converts newlines to "\n" text.
| * | mathematically & hypothetically speaking we want to avoid negative values ↵SignpostMarv2012-09-121-7/+7
| | | | | | | | | | | | being written
| * | Make "show http-handlers" command available for ROBUST instances as well as ↵Justin Clark-Casey (justincc)2012-09-121-0/+51
| | | | | | | | | | | | the simulator executable.
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-09-121-1/+19
| |\ \
| * | | Add levels 4 and 5 to "debug http" console command that will log a sample of ↵Justin Clark-Casey (justincc)2012-09-113-12/+90
| | | | | | | | | | | | | | | | | | | | | | | | incoming request data and the entire incoming data respectively. See "help debug http" for more details.
* | | | Merge branch 'avination' into careminsterMelanie2012-09-101-1/+2
|\ \ \ \ | | |_|/ | |/| |
| * | | add a extra httppool thread to compensate for webfetchinventoryUbitUmarov2012-09-101-1/+2
| | | |
* | | | Merge branch 'master' into careminsterMelanie2012-09-092-0/+19
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * | | implementing per-region configuration of limits on the number of prims one ↵SignpostMarv2012-09-091-1/+19
| | |/ | |/| | | | | | | | | | | | | | | | | | | can have in a linkset Applied with changes - patch was based on a repo different from core Signed-off-by: Melanie <melanie@t-data.com>
| * | 4096 is used in various places as the maximum height of a region, ↵SignpostMarv2012-09-081-0/+1
| | | | | | | | | | | | refactoring to be a constant
* | | Merge branch 'master' into careminsterMelanie2012-09-071-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs OpenSim/Framework/Servers/VersionInfo.cs
| * | Bump master code up to 0.7.5 now that 0.7.4 is out.Justin Clark-Casey (justincc)2012-09-041-1/+1
| | |
* | | Merge branch 'avination' into careminsterMelanie2012-08-312-2/+4
|\ \ \ | | |/ | |/|
| * | Fix background inventory loading (Viewer 3) so it won't lag out the simMelanie2012-08-242-2/+4
| | |
* | | Merge branch 'master' into careminsterMelanie2012-08-292-15/+17
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
| * | Fix regression introduced in a0d178b2 (Sat Aug 25 02:00:17 2012) where ↵Justin Clark-Casey (justincc)2012-08-292-15/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | folders with asset type of 'Folder' and 'Unknown' were accidentally treated as system folders. This prevented more than one additional ordinary folder from being created in the base "My Inventory" user folder. Added regression test for this case. Switched tests to use XInventoryService with mostly implemented TestXInventoryDataPlugin rather than InventoryService Disabled TestLoadIarV0_1SameNameCreator() since this has not been working for a very long time (ever since XInventoryService) started being used since it doesnt' preserve creator data in the same way as InventoryService did and so effectively lost the OSPAs. However, nobody noticed/complained about this issue and OSPAs have been superseded by HG like creator information via the --home save oar/iar switch.
* | | Merge branch 'master' into careminsterMelanie2012-08-232-31/+67
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/IClientAPI.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | Tighten up OpenSim.Framework.Cache locking to avoid race conditions.Justin Clark-Casey (justincc)2012-08-201-30/+53
| | | | | | | | | | | | | | | This is to resolve a reported issue in http://opensimulator.org/mantis/view.php?id=6232 Here, the land management module is using OpenSim.Framework.Cache (the only code to currently do so apart from the non-default CoreAssetCache).
| * | Add --force flag to "kick user" console command to allow bypassing of recent ↵Justin Clark-Casey (justincc)2012-08-201-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | race condition checks. This is to allow a second attempt to remove an avatar even if "show connections" shows them as already inactive (i.e. close has already been attempted once). You should only attempt --force if a normal kick fails. This is partly for diagnostics as we have seen some connections occasionally remain on lbsa plaza even if they are registered as inactive. This is not a permanent solution and may not work anyway - the ultimate solution is to stop this problem from happening in the first place.
generated by cgit v1.1 at 2024-12-25 09:05:31 +0000