| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into careminster | Melanie | 2013-10-04 | 1 | -22/+35 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Data/MySQL/Resources/RegionStore.migrations OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs OpenSim/Region/CoreModules/World/LightShare/LightShareModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCapabilityTests.cs OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| | * | Change handling of the FetchInventoryDescendents2 capability configuration ↵ | Mic Bowman | 2013-09-11 | 1 | -23/+36 |
| | | | | | | | | | | | | | to allow for external handlers. | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2013-07-24 | 1 | -35/+32 |
| |\ \ | |/ | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | ||||
| | * | revert last commit which seems to conflict with DoubleQueue internals. The ↵ | dahlia | 2013-07-16 | 1 | -10/+5 |
| | | | | | | | | | random crash might be in DoubleQueue instead. See http://pastebin.com/XhNBNqsc | ||||
| | * | add locking to internal queue in WebFetchInvDescModule; lack of which caused ↵ | dahlia | 2013-07-16 | 1 | -5/+10 |
| | | | | | | | | | a random crash in a load test yesterday | ||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2013-07-15 | 1 | -2/+3 |
| | |\ | |||||
| | | * | Guard against null ref | Diva Canto | 2013-07-15 | 1 | -1/+2 |
| | | | | |||||
| | * | | Add request received/handling stats for caps which are served by http poll ↵ | Justin Clark-Casey (justincc) | 2013-07-15 | 1 | -35/+31 |
| | |/ | | | | | | | | | | | | | handlers. This adds explicit cap poll handler supporting to the Caps classes rather than relying on callers to do the complicated coding. Other refactoring was required to get logic into the right places to support this. | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2013-07-18 | 1 | -0/+2 |
| |\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| | * | Get InventoryWorkerThreads to update watchdog on processing requests | Justin Clark-Casey (justincc) | 2013-07-06 | 1 | -0/+2 |
| | | | |||||
| | * | minor: remove mono compiler warnings in WebFetchInvDescModule | Justin Clark-Casey (justincc) | 2013-06-17 | 1 | -3/+2 |
| | | | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2013-06-18 | 1 | -6/+4 |
| |\ \ | |/ | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Services/LLLoginService/LLLoginResponse.cs OpenSim/Services/LLLoginService/LLLoginService.cs | ||||
| | * | Don't try to abort worker threads in WebFetchInvDescModule if module was not ↵ | Justin Clark-Casey (justincc) | 2013-06-14 | 1 | -6/+4 |
| | | | | | | | | | | | | | enabled. This also moves the abort to RemoveRegion() rather than a destructor. | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2013-06-08 | 1 | -0/+29 |
| |\ \ | |/ | |||||
| | * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2013-06-07 | 1 | -0/+29 |
| | |\ | |||||
| | | * | Put the configuration back in FetchInventoryDesc2 cap. | Diva Canto | 2013-06-07 | 1 | -0/+29 |
| | | | | |||||
| | * | | Supply proper type information for the various types of requests | Melanie | 2013-06-07 | 1 | -0/+1 |
| | | | | |||||
| | * | | Adding Avination's PollService to round out the HTTP inventory changes | Melanie | 2013-06-07 | 1 | -2/+2 |
| | |/ | |||||
| | * | Port Avination's inventory send throttling | Melanie | 2013-06-05 | 1 | -52/+213 |
| | | | |||||
| * | | Make a viewer sent XML error prettier | Melanie | 2013-03-03 | 1 | -0/+4 |
| | | | |||||
| * | | Move SoubleQueu to Util. Change HTTP inv to prioritize COF. Determine COF for SP | Melanie | 2013-02-06 | 1 | -7/+70 |
| | | | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-11-13 | 1 | -1/+1 |
| |\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs | ||||
| | * | Cleanup on region modules: gave short node id's to all of them. | Diva Canto | 2012-11-12 | 1 | -1/+1 |
| | | | |||||
| * | | just remove the damm thing | UbitUmarov | 2012-09-26 | 1 | -1/+1 |
| | | | |||||
| * | | Seems nothing actually need the request body for getevents. so change | UbitUmarov | 2012-09-26 | 1 | -1/+0 |
| | | | | | | | | | control flag to false | ||||
| * | | more changes to PollService | UbitUmarov | 2012-09-26 | 1 | -0/+1 |
| | | | |||||
| * | | do the same to webFecthInvDescModule | UbitUmarov | 2012-09-25 | 1 | -33/+25 |
| | | | |||||
| * | | Protect the responses map with a lock. Also remove ugly "this." type of | Melanie | 2012-09-23 | 1 | -12/+16 |
| | | | | | | | | | member notation. | ||||
| * | | 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 |
| | | | |||||
| * | | 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 |
| |/ | |||||
| * | Implement optional name and description on http stream handlers so that we ↵ | Justin Clark-Casey (justincc) | 2012-05-03 | 1 | -2/+7 |
| | | | | | | | 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. | ||||
| * | Use the same web fetch handler for every request from every avatar, since it ↵ | Justin Clark-Casey (justincc) | 2011-11-26 | 1 | -3/+11 |
| | | | | | contains no instance code | ||||
| * | Fix config so that you can have both WebFetchInventoryDescendents and ↵ | Justin Clark-Casey (justincc) | 2011-11-25 | 1 | -1/+2 |
| | | | | | FetchInvnetoryDescendents2 caps active at once | ||||
| * | Resolve error where an unknown asset type would cause the fetch inventory ↵ | Justin Clark-Casey (justincc) | 2011-11-25 | 1 | -4/+1 |
| | | | | | | | descendents cap to fail. Introduced just a few commits ago in 0688861 | ||||
| * | Implement the FetchInventoryDescendents2 capability using the same code as ↵ | Justin Clark-Casey (justincc) | 2011-11-25 | 1 | -17/+38 |
| | | | | | | | WebFetchInventoryDescendents. Enabling this by setting Cap_FetchInventoryDescendents2 = "localhost" in the [ClientStack.LindenCaps] section of OpenSim.ini downloads inventory via http rather than udp in later viewers. | ||||
| * | Fix WebFetchInventoryDescendents cap to use ↵ | Justin Clark-Casey (justincc) | 2011-11-25 | 1 | -0/+2 |
| | | | | | | | Utils.AssetTypeTostring/InventoryTypeToString to convert types to strings These cover a wider range of types. | ||||
| * | Test m_Enabled on RemoveRegion. | Diva Canto | 2011-05-04 | 1 | -0/+3 |
| | | |||||
| * | WebFetchInventoryDescendents working. Tested with robust. | Diva Canto | 2011-05-02 | 1 | -0/+131 |
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |