| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into careminster | Melanie | 2013-05-01 | 1 | -1/+12 |
| |\ | | | | | | | | | Conflicts: ThirdParty/SmartThreadPool/SmartThreadPool.cs | ||||
| | * | Fix CAPS to work like they should - do not send caps to the viewer if ↵ | Melanie | 2013-04-30 | 1 | -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 PermissionMask | Melanie | 2013-03-26 | 1 | -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" | ||||
| * | | Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMask | Melanie | 2013-03-24 | 1 | -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 careminster | Melanie | 2013-03-03 | 1 | -0/+3 |
| |\ \ | | | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs | ||||
| | * | | Fix an issue where the viewer would request the seed cap before | Melanie | 2013-02-18 | 1 | -0/+3 |
| | | | | | | | | | | | | | there was a handler for it. | ||||
| | * | | Rename Bounciness to Restitution | Melanie | 2013-02-07 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2013-02-22 | 1 | -1/+1 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | minor: remove some mono compiler warnings in ↵ | Justin Clark-Casey (justincc) | 2013-02-20 | 1 | -1/+1 |
| | | | | | | | | | | | | | OpenSim.Region.ClientStack.Linden.Caps.dll | ||||
| | * | | Send the new physics params to the viewer build dialog | Melanie | 2013-02-07 | 1 | -0/+35 |
| | | | | |||||
| | * | | * the root prim was being given an OffsetPosition in addition to setting the ↵ | teravus | 2013-02-05 | 1 | -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. | Melanie | 2013-02-05 | 1 | -12/+27 |
| | | | | |||||
| * | | | Rename Bounciness to Restitution | Melanie | 2013-02-07 | 1 | -1/+1 |
| | | | | |||||
| * | | | 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 '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 | 1 | -60/+123 |
| | | | |||||
| * | | try to allow free uploads for testing, if users prefix names with "TEST-". Let | UbitUmarov | 2012-09-23 | 1 | -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 away | UbitUmarov | 2012-09-22 | 1 | -16/+64 |
| | | | |||||
| * | | 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 | 1 | -0/+21 |
| | | | |||||
| * | | Fix model upload rotations and offsets ( i hope ) | UbitUmarov | 2012-09-20 | 1 | -103/+56 |
| | | | |||||
| * | | be more tolerant to small prims, skipping them, only failing if they are | UbitUmarov | 2012-09-19 | 1 | -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 and | UbitUmarov | 2012-09-19 | 1 | -3/+11 |
| | | | | | | | | | check scene prim size limits. | ||||
| * | | coment out mesh model upload code to add textures and individual meshs | UbitUmarov | 2012-09-19 | 1 | -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 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 |
| | | | |||||
| * | | 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 | 1 | -19/+10 |
| | | | |||||
| * | | 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 | ||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |