aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | |
* | | Make uploads free for now - we will have to announce thisMelanie2012-09-201-3/+6
| | |
* | | Change texture price back to 10 C$Melanie2012-09-191-3/+2
|/ /
* | be more tolerant to small prims, skipping them, only failing if they areUbitUmarov2012-09-192-16/+82
| | | | | | | | | | 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-192-14/+56
| | | | | | | | check scene prim size limits.
* | coment out mesh model upload code to add textures and individual meshsUbitUmarov2012-09-192-204/+255
| | | | | | | | | | | | 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
| |
* | same cleanupUbitUmarov2012-09-171-38/+41
| |
* | removed broken fee compressionUbitUmarov2012-09-171-15/+1
| |
* | 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-172-24/+13
| |
* | missing file for suport of mesh upload costUbitUmarov2012-09-171-0/+596
| |
* | Allow some more connections to try to ease lag.Melanie2012-09-141-1/+3
| |
* | Add a logger so the prior commit will workMelanie2012-09-121-0/+3
| |
* | Stop expiry timer when upload is complete. Log if timeout is reached.Melanie2012-09-121-0/+2
| |
* | Add a timer to time out upload caps handlers that are not used.Melanie2012-09-121-0/+12
| |
* | Add a missing brace, remove a useless temp variable, enable charging.Melanie2012-09-111-6/+3
| |
* | report mesh upload costs ( fake values)UbitUmarov2012-09-111-2/+46
| |
* | let LLSDAssetUploadRequest include asset_resources information plus letUbitUmarov2012-09-111-0/+1
| | | | | | | | NewAgentInventoryRequest know about mesh (does nothing with it still)
* | Add cost calculation suppor tto the VariablePrice one as wellMelanie2012-09-111-1/+0
| |
* | Add the option to have variable costing for uploadsMelanie2012-09-111-7/+44
| |
* | Merge branch 'master' into careminsterMelanie2012-08-041-1/+6
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * Consolidate PersistBakedTextures, DelayBeforeAppearanceSend and ↵Justin Clark-Casey (justincc)2012-08-031-1/+6
| | | | | | | | | | | | 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 'master' into careminsterMelanie2012-05-101-1/+1
|\ \ | |/
| * Improve logging on the prim inventory script asset request path for future use.Justin Clark-Casey (justincc)2012-05-091-1/+1
| | | | | | | | This adds name and description of the request handler to http request logging when DebugLevel >= 1
* | Merge branch 'master' into careminsterMelanie2012-05-051-10/+38
|\ \ | |/ | | | | | | | | | | | | | | 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-031-10/+37
| | | | | | | | | | | | 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 careminsterMelanie2012-04-271-1/+4
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * minor: Add more detail to unauthorized caps client messageJustin Clark-Casey (justincc)2012-04-261-1/+4
| |
* | Merge branch 'master' into careminsterMelanie2012-03-271-7/+27
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * User level based restrictions for HyperGrid teleports, asset uploads, group ↵Snoopy Pfeffer2012-03-271-7/+27
| | | | | | | | creations and getting contacted from other grids. Incoming HyperGrid teleports can also be restricted to local users.
* | Merge branch 'master' into careminsterMelanie2012-03-201-1/+1
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs