aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Capabilities (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-10-061-1/+1
|\ | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
| * Bump OPenSimulator version and assembly versions up to 0.8.0 DevJustin Clark-Casey (justincc)2013-10-041-1/+1
| |
* | Merge branch 'master' into careminsterMelanie2013-07-241-6/+87
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-07-151-0/+76
| |\
| * | Add request received/handling stats for caps which are served by http poll ↵Justin Clark-Casey (justincc)2013-07-151-6/+87
| | | | | | | | | | | | | | | | | | | | | 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 careminsterMelanie2013-07-185-5/+93
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Added UploadBakedTexture/UploadBakedTextureServerConnector, so that this can ↵Diva Canto2013-07-131-0/+76
| |/ | | | | | | eventually be served by a robust instance. NOT FINISHED YET.
| * minor: Add back commented out logging message in Caps.RegisterHandler() that ↵Justin Clark-Casey (justincc)2013-07-081-0/+1
| | | | | | | | I accidentally removed.
| * For stat purposes, add names to capability request handlers where these were ↵Justin Clark-Casey (justincc)2013-07-081-1/+0
| | | | | | | | not set
| * Add "show caps stats by user" and "show caps stats by cap" console commands ↵Justin Clark-Casey (justincc)2013-07-084-5/+17
| | | | | | | | | | | | | | | | | | to print various counts of capability invocation by user and by cap This currently prints caps requests received and handled, so that overload of received compared to handled or deadlock can be detected. This involves making BaseStreamHandler and BaseOutputStream record the ints, which means inheritors should subclass ProcessRequest() instead of Handle() However, existing inheriting classes overriding Handle() will still work, albeit without stats recording. "show caps" becomes "show caps list" to disambiguate between show caps commands
| * Revert "A little more debug for the Unknown User problem mantis #6625"Diva Canto2013-06-301-3/+0
| | | | | | | | This reverts commit ff47cf77ab52d42195fb0f089599618511d4919b.
| * A little more debug for the Unknown User problem mantis #6625Diva Canto2013-06-291-0/+3
| |
* | Merge branch 'master' into careminsterMelanie2013-06-231-2/+2
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Framework/Monitoring/BaseStatsCollector.cs OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
| * minor: fix mono compiler warning in FetchInventory2HandlerJustin Clark-Casey (justincc)2013-06-201-2/+2
| |
* | Merge branch 'master' into careminsterMelanie2013-06-111-0/+1
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
| * Remove Temporary from use to shortcut asset stores. The Local propertyMic Bowman2013-06-101-0/+1
| | | | | | | | | | | | differentiates between local & grid storage. The Temporary property just says that which service handles the it, the asset can be safely removed in the future.
* | Merge branch 'avination-current' into careminsterMelanie2013-06-062-2/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs OpenSim/Region/Framework/Interfaces/IDynamicMenuModule.cs OpenSim/Region/OptionalModules/ViewerSupport/DynamicMenuModule.cs OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
| * | Fix multi-wear of alpha and tattoo layers.Melanie2013-05-312-2/+2
| | |
| * | Fix CAPS to work like they should - do not send caps to the viewer if ↵Melanie2013-04-301-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | they're not in the requested caps list. The previous wrong behavior caused the debug setting "UseHTTPInventory" to fail on all viewers when turned off. UDB inventory would not be correctly used in that case.
* | | Merge branch 'master' into careminsterMelanie2013-05-082-0/+167
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
| * | Added AvatarPickerSearch capability handler.Diva Canto2013-05-072-0/+167
| | |
* | | Merge branch 'master' into careminsterMelanie2013-05-011-2/+5
|\ \ \ | |/ / | | / | |/ |/| Conflicts: ThirdParty/SmartThreadPool/SmartThreadPool.cs
| * Fix CAPS to work like they should - do not send caps to the viewer if ↵Melanie2013-04-301-2/+5
| | | | | | | | | | | | | | | | they're not in the requested caps list. The previous wrong behavior caused the debug setting "UseHTTPInventory" to fail on all viewers when turned off. UDB inventory would not be correctly used in that case.
* | Merge branch 'avination' into careminsterMelanie2013-03-031-0/+13
|\ \ | | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
| * | Fix an issue where the viewer would request the seed cap beforeMelanie2013-02-181-0/+13
| | | | | | | | | | | | there was a handler for it.
* | | Merge branch 'master' into careminsterMelanie2013-02-221-1/+1
|\ \ \ | | |/ | |/|
| * | Deleted all AssemblyFileVersion directivesDiva Canto2013-02-191-1/+1
| | |
* | | Merge branch 'avination' into careminsterMelanie2013-02-071-1/+1
|\ \ \ | | |/ | |/|
| * | Move SoubleQueu to Util. Change HTTP inv to prioritize COF. Determine COF for SPMelanie2013-02-061-1/+1
| | |
* | | Merge branch 'master' into careminsterMelanie2013-02-052-2/+2
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * | Bump version and assembly version numbers from 0.7.5 to 0.7.6Justin Clark-Casey (justincc)2013-02-052-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | This is mostly Bluewall's work but I am also bumping the general version number OpenSimulator 0.7.5 remains in the release candidate stage. I'm doing this because master is significantly adding things that will not be in 0.7.5 This update should not cause issues with existing external binary DLLs because our DLLs do not have strong names and so the exact version match requirement is not in force.
* | | Merge branch 'avination' into careminsterMelanie2013-01-231-4/+19
|\ \ \ | | |/ | |/|
| * | * A better way to handle the last fix (This is in case the viewer provides a ↵teravus2013-01-211-10/+16
| | | | | | | | | | | | list of preferred formats, though, technically, the sim would pick the first provided format the old way). This just makes it more obvious what's happening.
| * | * The fallthrough of FetchTexture was no longer resulting in a 404 response ↵teravus2013-01-211-1/+10
| | | | | | | | | | | | on missing textures. It was just waiting and no event was being provided. This re-enables the 404 response.
* | | Merge branch 'avination' into careminsterMelanie2013-01-101-3/+10
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | * This finishes the implementation of AgentCachedTexture. Requires the ↵teravus2012-12-291-3/+10
| | | | | | | | | | | | XBakes Module and service for full functionality. Previous no-cache functionality works without the service and module. In some ways, I would have been happier not putting an AssetBase in WearableCacheItem.. but turns out it was probably unavoidable. No additional locks, yay.
* | | Merge branch 'avination' into careminsterMelanie2013-01-061-1/+1
|\ \ \ | |/ /
| * | * Partial Commit for Avatar Appearance to include the functionality of ↵teravus2012-12-211-1/+1
| | | | | | | | | | | | Cached Bakes.
* | | Merge branch 'master' into careminsterMelanie2012-12-071-1/+34
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * | minor: change method doc on GetTextureHandler.TryParseRange(), mainly to ↵Justin Clark-Casey (justincc)2012-12-061-2/+2
| | | | | | | | | | | | trigger another build
| * | Allow GetTexture calls with no second value in the range header (e.g. just ↵Justin Clark-Casey (justincc)2012-12-061-1/+34
| | | | | | | | | | | | | | | | | | | | | | | | 5333-) It looks like the latest Kokua is doing this. As per http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html, leaving off the second value is legal This indicates the caller wants the rest of the entity.
* | | Merge branch 'avination' into careminsterMelanie2012-11-251-0/+3
|\ \ \ | | |/ | |/|
| * | * Fix a null ref error in ↵teravus2012-11-241-0/+3
| | | | | | | | | | | | /..../OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs:339
* | | Merge branch 'master' into careminsterMelanie2012-11-251-1/+1
|\ \ \ | |/ / |/| / | |/ | | | | Conflicts: OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
| * Consistenly make NUnit test cases inherit from OpenSimTestCase which ↵Justin Clark-Casey (justincc)2012-11-241-1/+1
| | | | | | | | automatically turns off any logging enabled between tests
* | Merge branch 'avination' into careminsterMelanie2012-11-201-1/+20
|\ \
| * | * Plumbing and basic setting of the GetMesh Cap Throttler.teravus2012-11-171-1/+20
| | | | | | | | | | | | * Last step is to flip the throttle distribution.
| * | Revert "Merge master into teravuswork", it should have been avination, not ↵teravus2012-11-151-16/+2
| | | | | | | | | | | | | | | | | | | | | master. This reverts commit dfac269032300872c4d0dc507f4f9062d102b0f4, reversing changes made to 619c39e5144f15aca129d6d999bcc5c34133ee64.
| * | Merge master into teravusworkteravus2012-11-151-2/+16
| |\ \
* | \ \ Merge commit '619c39e5144f15aca129d6d999bcc5c34133ee64' into careminsterMelanie2012-11-201-5/+135
|\ \ \ \ | |/ / / | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs
generated by cgit v1.1 at 2024-09-12 20:20:49 +0000