| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into careminster | Melanie | 2013-01-10 | 1 | -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 viewers | Melanie | 2013-01-08 | 1 | -2/+20 |
| | | | | | | | | | work. | ||||
| * | | Add the new UpdateAgentInformation cap to make maturity on more recent viewers | Melanie | 2013-01-08 | 1 | -0/+19 |
| | | | | | | | | | work. | ||||
| * | | 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 |
| | | | |||||
| * | | Merge branch 'avination' into careminster | Melanie | 2012-10-18 | 1 | -11/+11 |
| |\ \ | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/WebUtil.cs OpenSim/Region/Physics/OdePlugin/OdeScene.cs | ||||
| | * | | Remove redundant and annoyingly modal message box in upload processing. | Melanie | 2012-10-18 | 1 | -11/+11 |
| | | | | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-10-16 | 1 | -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-16 | 1 | -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 messages | Melanie | 2012-09-24 | 1 | -4/+4 |
| | | | |||||
| * | | more upload changes (plus untouch prebuild.xml) | UbitUmarov | 2012-09-24 | 2 | -68/+128 |
| | | | |||||
| * | | Merge branch 'ubitwork' into avination | Melanie | 2012-09-23 | 2 | -195/+365 |
| |\ \ | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/MeshCost.cs | ||||
| | * | | try to allow free uploads for testing, if users prefix names with "TEST-". Let | UbitUmarov | 2012-09-23 | 2 | -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 away | UbitUmarov | 2012-09-22 | 2 | -29/+75 |
| | | | | |||||
| | * | | removed AssetUploaderWithCost, fixing AssetUploader. add parsing of some | UbitUmarov | 2012-09-22 | 1 | -42/+24 |
| | | | | | | | | | | | | | more needed fields in request | ||||
| | * | | read model upload cost parameters from config [Economy] section | UbitUmarov | 2012-09-21 | 2 | -4/+23 |
| | | | | |||||
| | * | | Fix model upload rotations and offsets ( i hope ) | UbitUmarov | 2012-09-20 | 1 | -103/+56 |
| | | | | |||||
| * | | | refix prior commit | Melanie | 2012-09-20 | 1 | -1/+1 |
| | | | | |||||
| * | | | Make uploads free for now - we will have to announce this | Melanie | 2012-09-20 | 1 | -3/+6 |
| | | | | |||||
| * | | | Change texture price back to 10 C$ | Melanie | 2012-09-19 | 1 | -3/+2 |
| |/ / | |||||
| * | | be more tolerant to small prims, skipping them, only failing if they are | UbitUmarov | 2012-09-19 | 2 | -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 and | UbitUmarov | 2012-09-19 | 2 | -14/+56 |
| | | | | | | | | | check scene prim size limits. | ||||
| * | | coment out mesh model upload code to add textures and individual meshs | UbitUmarov | 2012-09-19 | 2 | -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 items | Melanie | 2012-09-18 | 1 | -2/+4 |
| | | | |||||
| * | | ***TEST*** still bad... create inventory itens for model textures and ↵ | UbitUmarov | 2012-09-18 | 1 | -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 not | UbitUmarov | 2012-09-17 | 1 | -8/+23 |
| | | | | | | | | | meshs. (some prims can have same mesh) | ||||
| * | | make sure client still has money at upload | UbitUmarov | 2012-09-17 | 1 | -0/+16 |
| | | | |||||
| * | | same cleanup | UbitUmarov | 2012-09-17 | 1 | -38/+41 |
| | | | |||||
| * | | removed broken fee compression | UbitUmarov | 2012-09-17 | 1 | -15/+1 |
| | | | |||||
| * | | let mesh model estimator work even without money module, so other | UbitUmarov | 2012-09-17 | 1 | -22/+22 |
| | | | | | | | | | estimations can work | ||||
| * | | Make use of mesh cost functions | UbitUmarov | 2012-09-17 | 2 | -24/+13 |
| | | | |||||
| * | | missing file for suport of mesh upload cost | UbitUmarov | 2012-09-17 | 1 | -0/+596 |
| | | | |||||
| * | | Allow some more connections to try to ease lag. | Melanie | 2012-09-14 | 1 | -1/+3 |
| | | | |||||
| * | | Add a logger so the prior commit will work | Melanie | 2012-09-12 | 1 | -0/+3 |
| | | | |||||
| * | | Stop expiry timer when upload is complete. Log if timeout is reached. | Melanie | 2012-09-12 | 1 | -0/+2 |
| | | | |||||
| * | | Add a timer to time out upload caps handlers that are not used. | Melanie | 2012-09-12 | 1 | -0/+12 |
| | | | |||||
| * | | Add a missing brace, remove a useless temp variable, enable charging. | Melanie | 2012-09-11 | 1 | -6/+3 |
| | | | |||||
| * | | report mesh upload costs ( fake values) | UbitUmarov | 2012-09-11 | 1 | -2/+46 |
| | | | |||||
| * | | let LLSDAssetUploadRequest include asset_resources information plus let | UbitUmarov | 2012-09-11 | 1 | -0/+1 |
| | | | | | | | | | NewAgentInventoryRequest know about mesh (does nothing with it still) | ||||
| * | | Add cost calculation suppor tto the VariablePrice one as well | Melanie | 2012-09-11 | 1 | -1/+0 |
| | | | |||||
| * | | Add the option to have variable costing for uploads | Melanie | 2012-09-11 | 1 | -7/+44 |
| | | | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-08-04 | 1 | -1/+6 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | ||||
| | * | Consolidate PersistBakedTextures, DelayBeforeAppearanceSend and ↵ | Justin Clark-Casey (justincc) | 2012-08-03 | 1 | -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 careminster | Melanie | 2012-05-10 | 1 | -1/+1 |
| |\ \ | |/ | |||||
| | * | Improve logging on the prim inventory script asset request path for future use. | Justin Clark-Casey (justincc) | 2012-05-09 | 1 | -1/+1 |
| | | | | | | | | | This adds name and description of the request handler to http request logging when DebugLevel >= 1 | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-05-05 | 1 | -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-03 | 1 | -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 careminster | Melanie | 2012-04-27 | 1 | -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 message | Justin Clark-Casey (justincc) | 2012-04-26 | 1 | -1/+4 |
| | | | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-03-27 | 1 | -7/+27 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |