Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | let mesh model estimator work even without money module, so other | UbitUmarov | 2012-09-17 | 1 | -22/+22 |
| | | | | estimations can work | ||||
* | Make use of mesh cost functions | UbitUmarov | 2012-09-17 | 2 | -24/+13 |
| | |||||
* | missing file for suport of mesh upload cost | UbitUmarov | 2012-09-17 | 1 | -0/+596 |
| | |||||
* | Revamp the HTTP textures handler to allow a maximum of four fetches | Melanie | 2012-09-14 | 1 | -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. | Melanie | 2012-09-14 | 1 | -1/+3 |
| | |||||
* | Add a logger so the prior commit will work | Melanie | 2012-09-12 | 1 | -0/+3 |
| | |||||
* | Stop expiry timer when upload is complete. Log if timeout is reached. | Melanie | 2012-09-12 | 1 | -0/+2 |
| | |||||
* | Add a timer to time out upload caps handlers that are not used. | Melanie | 2012-09-12 | 1 | -0/+12 |
| | |||||
* | Add a missing brace, remove a useless temp variable, enable charging. | Melanie | 2012-09-11 | 1 | -6/+3 |
| | |||||
* | report mesh upload costs ( fake values) | UbitUmarov | 2012-09-11 | 1 | -2/+46 |
| | |||||
* | let LLSDAssetUploadRequest include asset_resources information plus let | UbitUmarov | 2012-09-11 | 1 | -0/+1 |
| | | | | NewAgentInventoryRequest know about mesh (does nothing with it still) | ||||
* | Removing the variable prica handler again. It's never called, was misnamed and | Melanie | 2012-09-11 | 1 | -332/+0 |
| | | | | probably never worked past the mesh beta. | ||||
* | Re-add the module and fix a typo | Melanie | 2012-09-11 | 1 | -0/+332 |
| | |||||
* | Rename NewFileAgentInventoryVariablePrice to NewAgentInventoryVariablePrice | Melanie | 2012-09-11 | 1 | -332/+0 |
| | | | | which is the name actually used in viewer code. | ||||
* | Add cost calculation suppor tto the VariablePrice one as well | Melanie | 2012-09-11 | 2 | -9/+44 |
| | |||||
* | Revert "Remove the unused NewFileAgentInventoryVariablePrice module." | Melanie | 2012-09-11 | 1 | -0/+296 |
| | | | | | | It's actually used. This reverts commit 94a8e5572b1529190a174f29f866b65e7b2ccc0e. | ||||
* | Add the option to have variable costing for uploads | Melanie | 2012-09-11 | 1 | -7/+44 |
| | |||||
* | Remove the unused NewFileAgentInventoryVariablePrice module. | Melanie | 2012-09-11 | 1 | -296/+0 |
| | |||||
* | Revamp the v3 inventory sending. Uses threads and some nifty mechanics to | Melanie | 2012-09-11 | 1 | -81/+117 |
| | | | | leverage the Poll Service without blocking it's workers. | ||||
* | Remove commented code | Melanie | 2012-09-10 | 1 | -11/+0 |
| | |||||
* | webFetchInventory: change control event to simple flag, adjust locking | UbitUmarov | 2012-09-10 | 1 | -11/+32 |
| | |||||
* | bug fix | UbitUmarov | 2012-09-04 | 1 | -4/+6 |
| | |||||
* | a forgotten file plus minor changes. Imp and SL viewer seem to preserve | UbitUmarov | 2012-09-04 | 1 | -1/+6 |
| | | | | flight. FS 4.2.2 does not. | ||||
* | Remove debug spam | Melanie | 2012-08-24 | 1 | -2/+2 |
| | |||||
* | Fix background inventory loading (Viewer 3) so it won't lag out the sim | Melanie | 2012-08-24 | 1 | -49/+103 |
| | |||||
* | Make the console output from the reigon console hookable | Melanie | 2012-08-18 | 1 | -0/+7 |
| | |||||
* | Actually add the module | Melanie | 2012-08-14 | 1 | -0/+234 |
| | |||||
* | Merge branch 'master' into careminster | Melanie | 2012-08-04 | 2 | -4/+9 |
|\ | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | ||||
| * | Consolidate PersistBakedTextures, DelayBeforeAppearanceSend and ↵ | Justin Clark-Casey (justincc) | 2012-08-03 | 2 | -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 careminster | Melanie | 2012-07-06 | 1 | -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 ↵ | UbitUmarov | 2012-07-04 | 1 | -1/+1 |
| | | | | | | | | | | | | it's timeout | ||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-06-15 | 1 | -1/+1 |
|\ \ \ | | |/ | |/| | |||||
| * | | Put all debug console commands into a single Debug section rather than ↵ | Justin Clark-Casey (justincc) | 2012-06-15 | 1 | -1/+1 |
| | | | | | | | | | | | | scattering them over other categories | ||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-06-15 | 1 | -1/+10 |
|\ \ \ | |/ / | |||||
| * | | Add main instance to internal MainServer.m_Servers list to simplify internal ↵ | Justin Clark-Casey (justincc) | 2012-06-15 | 1 | -1/+10 |
| | | | | | | | | | | | | | | | | | | logic. This does require the server to be added before it is set as the main Instance | ||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-06-14 | 1 | -1/+0 |
|\ \ \ | |/ / | |||||
| * | | minor: remove unnecessary IsAttachment = false setting for new object in ↵ | Justin Clark-Casey (justincc) | 2012-06-14 | 1 | -1/+0 |
| | | | | | | | | | | | | UploadObjectAssetModule, property always starts as false | ||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-05-19 | 1 | -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-18 | 1 | -10/+10 |
| | | | |||||
| * | | Add level 2 debug eq logging which logs event queue polls. | Justin Clark-Casey (justincc) | 2012-05-18 | 1 | -23/+32 |
| | | | | | | | | | | | | Refactor: eq message logging into common method. | ||||
| * | | refactor: move EventQueueGet path generation into common method. Rename ↵ | Justin Clark-Casey (justincc) | 2012-05-18 | 1 | -20/+33 |
| | | | | | | | | | | | | some local variables in line with code conventions. Add commented out EQG log lines for future use. | ||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-05-10 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | Improve logging on the prim inventory script asset request path for future use. | Justin Clark-Casey (justincc) | 2012-05-09 | 1 | -1/+1 |
| | | | | | | | | | | | | This adds name and description of the request handler to http request logging when DebugLevel >= 1 | ||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-05-05 | 12 | -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-03 | 12 | -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 careminster | Melanie | 2012-04-27 | 2 | -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-27 | 1 | -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. | ||||
| * | minor: Add more detail to unauthorized caps client message | Justin Clark-Casey (justincc) | 2012-04-26 | 1 | -1/+4 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2012-03-27 | 2 | -20/+58 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| * | User level based restrictions for HyperGrid teleports, asset uploads, group ↵ | Snoopy Pfeffer | 2012-03-27 | 2 | -20/+58 |
| | | | | | | | | creations and getting contacted from other grids. Incoming HyperGrid teleports can also be restricted to local users. |