aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs (follow)
Commit message (Collapse)AuthorAgeFilesLines
* seems to compile ( tests comented out)UbitUmarov2015-09-021-110/+12
|
* bad merge?UbitUmarov2015-09-011-127/+851
|\
| * changed skeleton, do parse the mesh on upload to check skeleton. Sooner orUbitUmarov2014-10-111-21/+23
| | | | | | | | later this parsing needs to validate the model cost also.
| * dont let test mesh go to meshes inventory folder that is not displayed byUbitUmarov2014-10-111-1/+3
| | | | | | | | viewers
| * bug fixUbitUmarov2014-10-111-2/+3
| |
| * check for avatar skeleton data on meshs headers on cost estimation. DontUbitUmarov2014-10-111-6/+62
| | | | | | | | | | | | | | let a model have more than one mesh with skeleton, for testing create a mesh inventory item, for this meshs. Add also option to read a avatar collider replacement. This information still needs to be saved somewhere so it can be checked on attachment, etc, without parsing the mesh asset again.
| * 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
| * \ 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
| * \ \ 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
| * | | | 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
| |\ \ \ \ \
| * | | | | | 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-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | work.
| * | | | | | 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
| * | | | | | | Text changes for upload messagesMelanie2012-09-241-4/+4
| | | | | | | |
| * | | | | | | more upload changes (plus untouch prebuild.xml)UbitUmarov2012-09-241-60/+123
| | | | | | | |
| * | | | | | | try to allow free uploads for testing, if users prefix names with "TEST-". LetUbitUmarov2012-09-231-35/+190
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-221-16/+64
| | | | | | | |
| * | | | | | | 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-211-0/+21
| | | | | | | |
| * | | | | | | Fix model upload rotations and offsets ( i hope )UbitUmarov2012-09-201-103/+56
| | | | | | | |
| * | | | | | | be more tolerant to small prims, skipping them, only failing if they areUbitUmarov2012-09-191-12/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | more than half of total. Add a state control to NewFileAgentInventory to avoid more than one at a time per client. ( Incomplete and possible not that good)
| * | | | | | | create a single ModelCost provider for the caps instance. Let it know andUbitUmarov2012-09-191-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | check scene prim size limits.
| * | | | | | | coment out mesh model upload code to add textures and individual meshsUbitUmarov2012-09-191-182/+198
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | assets to inventory, since it may actually be a bad ideia since good model textures are deply related to it and there is no current use for independent mesh assets. Added the option to have a reduced free for textures (2.5 C$ as is, total textures cost rounded to nearest int) compensating for the fact that they can't be used outside the model or its parts.
| * | | | | | | Add booleans to control whether we actually crete inventory itemsMelanie2012-09-181-2/+4
| | | | | | | |
| * | | | | | | ***TEST*** still bad... create inventory itens for model textures and ↵UbitUmarov2012-09-181-7/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | meshs. Issues: meshs get into root folder, viewer and viewer does not update inventory until relog ( the upload funtion needs to return more information) ,etc. Droping a mesh into a prim, makes viewer think we dropped a sculpt map, but it does work, viewer displays the mesh and physics work (as physics is stored at the sculpt information fields). Textures show up in Textures folder, just its to costly to find that default folder as is..
| * | | | | | | on upload store mesh list contents as mesh assets. Build prims by instances notUbitUmarov2012-09-171-8/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | meshs. (some prims can have same mesh)
| * | | | | | | make sure client still has money at uploadUbitUmarov2012-09-171-0/+16
| | | | | | | |
| * | | | | | | let mesh model estimator work even without money module, so otherUbitUmarov2012-09-171-22/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | estimations can work
| * | | | | | | Make use of mesh cost functionsUbitUmarov2012-09-171-19/+10
| | | | | | | |
| * | | | | | | Allow some more connections to try to ease lag.Melanie2012-09-141-1/+3
| | | | | | | |
generated by cgit v1.1 at 2024-12-20 22:02:15 +0000