aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden/Caps (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'avination' into careminsterMelanie2012-09-164-428/+400
|\ | | | | | | | | Conflicts: OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
| * Revamp the HTTP textures handler to allow a maximum of four fetchesMelanie2012-09-141-44/+179
| | | | | | | | at any time and to drop requests for avatars n longer in the scene
| * Allow some more connections to try to ease lag.Melanie2012-09-141-1/+3
| |
| * Add a logger so the prior commit will workMelanie2012-09-121-0/+3
| |
| * Stop expiry timer when upload is complete. Log if timeout is reached.Melanie2012-09-121-0/+2
| |
| * Add a timer to time out upload caps handlers that are not used.Melanie2012-09-121-0/+12
| |
| * Add a missing brace, remove a useless temp variable, enable charging.Melanie2012-09-111-6/+3
| |
| * report mesh upload costs ( fake values)UbitUmarov2012-09-111-2/+46
| |
| * let LLSDAssetUploadRequest include asset_resources information plus letUbitUmarov2012-09-111-0/+1
| | | | | | | | NewAgentInventoryRequest know about mesh (does nothing with it still)
| * Removing the variable prica handler again. It's never called, was misnamed andMelanie2012-09-111-332/+0
| | | | | | | | probably never worked past the mesh beta.
| * Re-add the module and fix a typoMelanie2012-09-111-0/+332
| |
| * Rename NewFileAgentInventoryVariablePrice to NewAgentInventoryVariablePriceMelanie2012-09-111-332/+0
| | | | | | | | which is the name actually used in viewer code.
| * Add cost calculation suppor tto the VariablePrice one as wellMelanie2012-09-112-9/+44
| |
| * Revert "Remove the unused NewFileAgentInventoryVariablePrice module."Melanie2012-09-111-0/+296
| | | | | | | | | | | | It's actually used. This reverts commit 94a8e5572b1529190a174f29f866b65e7b2ccc0e.
| * Add the option to have variable costing for uploadsMelanie2012-09-111-7/+44
| |
| * Remove the unused NewFileAgentInventoryVariablePrice module.Melanie2012-09-111-296/+0
| |
| * Revamp the v3 inventory sending. Uses threads and some nifty mechanics toMelanie2012-09-111-81/+117
| | | | | | | | leverage the Poll Service without blocking it's workers.
* | Merge branch 'avination' into careminsterMelanie2012-09-102-18/+35
|\ \ | |/
| * Remove commented codeMelanie2012-09-101-11/+0
| |
| * webFetchInventory: change control event to simple flag, adjust lockingUbitUmarov2012-09-101-11/+32
| |
| * bug fixUbitUmarov2012-09-041-4/+6
| |
| * a forgotten file plus minor changes. Imp and SL viewer seem to preserveUbitUmarov2012-09-041-1/+6
| | | | | | | | flight. FS 4.2.2 does not.
* | Merge branch 'avination' into careminsterMelanie2012-08-311-49/+103
|\ \ | |/
| * Remove debug spamMelanie2012-08-241-2/+2
| |
| * Fix background inventory loading (Viewer 3) so it won't lag out the simMelanie2012-08-241-49/+103
| |
* | Merge branch 'master' into careminsterMelanie2012-08-231-1/+1
|\ \ | |/ |/| | | | | | | | | | | | | | | | | 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
| * Add --force flag to "kick user" console command to allow bypassing of recent ↵Justin Clark-Casey (justincc)2012-08-201-1/+1
| | | | | | | | | | | | | | | | | | 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.
| * Actually add the moduleMelanie2012-08-141-0/+234
| |
* | Make the console output from the reigon console hookableMelanie2012-08-181-0/+7
| |
* | Actually add the moduleMelanie2012-08-141-0/+234
| |
* | Merge branch 'master' into careminsterMelanie2012-08-042-4/+9
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * Consolidate PersistBakedTextures, DelayBeforeAppearanceSend and ↵Justin Clark-Casey (justincc)2012-08-032-4/+9
| | | | | | | | | | | | DelayBeforeAppearanceSave into [Appearance] section from [Startup] config section so that all appearance settings are in the same place and not in the startup bucket. All these settings are in OpenSimDefaults.ini only. If you are using them then please adjust your OpenSim.ini
* | Merge branch 'avination' into careminsterMelanie2012-07-061-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | added a timeout paramenter to PollServiceEventArgs, so each type can define ↵UbitUmarov2012-07-041-1/+1
| | | | | | | | | | | | it's timeout
* | | Merge branch 'master' into careminsterMelanie2012-06-151-1/+1
|\ \ \ | | |/ | |/|
| * | Put all debug console commands into a single Debug section rather than ↵Justin Clark-Casey (justincc)2012-06-151-1/+1
| | | | | | | | | | | | scattering them over other categories
* | | Merge branch 'master' into careminsterMelanie2012-06-151-1/+10
|\ \ \ | |/ /
| * | Add main instance to internal MainServer.m_Servers list to simplify internal ↵Justin Clark-Casey (justincc)2012-06-151-1/+10
| | | | | | | | | | | | | | | | | | logic. This does require the server to be added before it is set as the main Instance
* | | Merge branch 'master' into careminsterMelanie2012-06-141-1/+0
|\ \ \ | |/ /
| * | minor: remove unnecessary IsAttachment = false setting for new object in ↵Justin Clark-Casey (justincc)2012-06-141-1/+0
| | | | | | | | | | | | UploadObjectAssetModule, property always starts as false
* | | Merge branch 'master' into careminsterMelanie2012-05-191-39/+61
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
| * | Fix build break. Comment out EQG deregister/register logging.Justin Clark-Casey (justincc)2012-05-181-10/+10
| | |
| * | Add level 2 debug eq logging which logs event queue polls.Justin Clark-Casey (justincc)2012-05-181-23/+32
| | | | | | | | | | | | Refactor: eq message logging into common method.
| * | refactor: move EventQueueGet path generation into common method. Rename ↵Justin Clark-Casey (justincc)2012-05-181-20/+33
| | | | | | | | | | | | some local variables in line with code conventions. Add commented out EQG log lines for future use.
* | | Merge branch 'master' into careminsterMelanie2012-05-101-1/+1
|\ \ \ | |/ /
| * | Improve logging on the prim inventory script asset request path for future use.Justin Clark-Casey (justincc)2012-05-091-1/+1
| | | | | | | | | | | | This adds name and description of the request handler to http request logging when DebugLevel >= 1
* | | Merge branch 'master' into careminsterMelanie2012-05-0512-80/+138
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | 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
| * | Implement optional name and description on http stream handlers so that we ↵Justin Clark-Casey (justincc)2012-05-0312-80/+137
| | | | | | | | | | | | | | | | | | 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.
* | | Merge branch 'master' into careminsterMelanie2012-04-272-2/+5
|\ \ \ | |/ / | | / | |/ |/| | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * Add regression test for teleporting an agent between separated regions on ↵Justin Clark-Casey (justincc)2012-04-271-1/+1
| | | | | | | | | | | | | | | | the same simulator. This involves a large amount of change in test scene setup code to allow test scenes to share shared modules SetupScene is now an instance method that requires an instantiation of SceneHelpers, though other SceneHelpers methods are still static May split these out into separate classes in the future.
generated by cgit v1.1 at 2024-12-28 03:08:32 +0000