aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps (follow)
Commit message (Collapse)AuthorAgeFilesLines
* change it again...UbitUmarov2014-09-261-1/+1
|
* remove unnecessary argument refUbitUmarov2014-09-261-1/+1
|
* make c# more happyUbitUmarov2014-09-261-4/+1
|
* use central animationset permitions defineUbitUmarov2014-09-261-2/+2
|
* Extend upload verification to all upload pathsMelanie Thielker2014-09-251-0/+8
|
* fix animation asset name to "animatn", use "animset" for the newUbitUmarov2014-09-251-8/+10
| | | | animationSet
* add also the name animset until its clear the name liru will useUbitUmarov2014-09-251-0/+7
|
* add animationset to upload assets, for now no costUbitUmarov2014-09-251-0/+6
|
* also on other caseUbitUmarov2014-08-091-0/+11
|
* return even zero costs ( prims on other regions )UbitUmarov2014-08-091-1/+1
|
* move from RegisterInventoryServiceHandlers toUbitUmarov2014-08-091-9/+14
| | | | RegisterRegionServiceHandlers what belongs there ( readabilitly only )
* Merge branch 'master' into careminsterMelanie2013-12-071-0/+4
|\ | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * minor: Use enums for setting inv/asset types on data upload rather than ↵Justin Clark-Casey (justincc)2013-12-061-7/+7
| | | | | | | | magic numbers
| * Properly set InventoryType.Snapshot when a snapshot is uploadedJustin Clark-Casey (justincc)2013-12-061-0/+4
| | | | | | | | | | Resolves http://opensimulator.org/mantis/view.php?id=6857 This prevents the inventory service complaining later about an attempt to change an invariant
* | Merge branch 'master' into careminsterMelanie2013-07-241-12/+1
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
| * Add request received/handling stats for caps which are served by http poll ↵Justin Clark-Casey (justincc)2013-07-151-12/+1
| | | | | | | | | | | | | | 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-181-2/+8
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * For stat purposes, add names to capability request handlers where these were ↵Justin Clark-Casey (justincc)2013-07-081-2/+8
| | | | | | | | not set
| * Fix CAPS to work like they should - do not send caps to the viewer if ↵Melanie2013-04-301-1/+12
| | | | | | | | | | | | | | | | 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.
| * Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMaskMelanie2013-03-261-2/+3
| | | | | | | | with our own and add export permissions as well as a new definition for "All" as meaning "all conventional permissions" rather than "all possible permissions"
* | Explicitly set uploaded mesh object permsMelanie2013-06-101-10/+13
| |
* | Fix CAPS to work like they should - do not send caps to the viewer if ↵Melanie2013-04-301-1/+12
| | | | | | | | | | | | | | | | 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.
* | Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMaskMelanie2013-03-241-4/+5
| | | | | | | | with our own and add export permissions as well as a new definition for "All" as meaning "all conventional permissions" rather than "all possible permissions"
* | Merge branch 'avination' into careminsterMelanie2013-03-031-0/+3
|\ \ | | | | | | | | | | | | 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/+3
| | | | | | | | | | | | there was a handler for it.
| * | Rename Bounciness to RestitutionMelanie2013-02-071-1/+1
| | |
* | | Merge branch 'master' into careminsterMelanie2013-02-221-1/+1
|\ \ \ | | |/ | |/|
| * | minor: remove some mono compiler warnings in ↵Justin Clark-Casey (justincc)2013-02-201-1/+1
| | | | | | | | | | | | OpenSim.Region.ClientStack.Linden.Caps.dll
| * | Send the new physics params to the viewer build dialogMelanie2013-02-071-0/+35
| | |
| * | * the root prim was being given an OffsetPosition in addition to setting the ↵teravus2013-02-051-1/+1
| | | | | | | | | | | | position when creating the root prim. The offset position caused the positioning code to re-move the root prim when you selected it and released it.
| * | Try to fix uploaded mesh rotations - code from Avination code base.Melanie2013-02-051-12/+27
| | |
* | | Rename Bounciness to RestitutionMelanie2013-02-071-1/+1
| | |
* | | Merge branch 'master' into careminsterMelanie2013-01-101-1/+0
|\ \ \ | |/ / | | / | |/ |/| | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * Add the new UpdateAgentInformation cap to make maturity on more recent viewersMelanie2013-01-081-2/+20
| | | | | | | | work.
* | Add the new UpdateAgentInformation cap to make maturity on more recent viewersMelanie2013-01-081-0/+19
| | | | | | | | work.
* | Merge branch 'master' into careminsterMelanie2012-11-131-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 Canto2012-11-121-1/+1
| |
* | Merge branch 'avination' into careminsterMelanie2012-10-181-11/+11
|\ \ | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/WebUtil.cs OpenSim/Region/Physics/OdePlugin/OdeScene.cs
| * | Remove redundant and annoyingly modal message box in upload processing.Melanie2012-10-181-11/+11
| | |
* | | Merge branch 'master' into careminsterMelanie2012-10-161-4/+5
|\ \ \ | |/ / |/| / | |/ | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs
| * minor: comment out "Registered seed capability" message for "Received SEED ↵Justin Clark-Casey (justincc)2012-10-161-4/+5
| | | | | | | | | | | | caps request" message for now. I think this is more useful right now since it tells us if the viewer requested a seed caps at all in various scenarios (such as when teleporting to a new region).
* | Text changes for upload messagesMelanie2012-09-241-4/+4
| |
* | more upload changes (plus untouch prebuild.xml)UbitUmarov2012-09-242-68/+128
| |
* | Merge branch 'ubitwork' into avinationMelanie2012-09-232-195/+365
|\ \ | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/MeshCost.cs
| * | try to allow free uploads for testing, if users prefix names with "TEST-". LetUbitUmarov2012-09-232-41/+210
| | | | | | | | | | | | | | | | | | | | | textures get into inventory again. Both features under config control. Have direct warnings to client, including a final one on upload complete since i see nothing. problems: textures don't showup in inventory til relog, also issues with permitions. A few more changes
| * | report asset upload errors the right awayUbitUmarov2012-09-222-29/+75
| | |
| * | removed AssetUploaderWithCost, fixing AssetUploader. add parsing of someUbitUmarov2012-09-221-42/+24
| | | | | | | | | | | | more needed fields in request
| * | read model upload cost parameters from config [Economy] sectionUbitUmarov2012-09-212-4/+23
| | |
| * | Fix model upload rotations and offsets ( i hope )UbitUmarov2012-09-201-103/+56
| | |
* | | refix prior commitMelanie2012-09-201-1/+1
| | |