| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | | | Text changes for upload messages | Melanie | 2012-09-24 | 1 | -4/+4 | |
| | | | | | | ||||||
| | * | | | | more upload changes (plus untouch prebuild.xml) | UbitUmarov | 2012-09-24 | 3 | -69/+128 | |
| | | | | | | ||||||
| | * | | | | touch prebuild.xml | UbitUmarov | 2012-09-24 | 1 | -0/+1 | |
| | | | | | | ||||||
| | * | | | | add missing transactionID in SendInventoryItemCreateUpdate. and make use | UbitUmarov | 2012-09-24 | 7 | -7/+38 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | of it on inventoryAccessModule, etc. Most likelly it's needs where there is a transactionID not zero | |||||
| | * | | | | Merge branch 'ubitwork' into avination | Melanie | 2012-09-24 | 4 | -37/+38 | |
| | |\ \ \ \ | ||||||
| | | * | | | | If an asset upload transaction doesn't exist for a CreateInventory request, | Melanie | 2012-09-24 | 4 | -37/+38 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | simply process it as if UUID.Zero had been given. | |||||
| | * | | | | | Protect the responses map with a lock. Also remove ugly "this." type of | Melanie | 2012-09-23 | 2 | -18/+24 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | member notation. | |||||
| | * | | | | | Merge branch 'ubitwork' into avination | Melanie | 2012-09-23 | 2 | -7/+39 | |
| | |\ \ \ \ \ | | |/ / / / | ||||||
| | | * | | | | Change the poll service to use a thread pool for replies to make sure the | Melanie | 2012-09-23 | 2 | -7/+39 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | event queues aren't blocked by other traffic. | |||||
| | * | | | | | Comment out asset error for sculpts/meshes. If an asset is missing it's missing. | Melanie | 2012-09-23 | 1 | -4/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | We can't put it back so we don't need to know. | |||||
| | * | | | | | Merge branch 'ubitwork' into avination | Melanie | 2012-09-23 | 6 | -203/+390 | |
| | |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | 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 | 3 | -41/+211 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 4 | -29/+87 | |
| | | | | | | | ||||||
| | | * | | | | removed AssetUploaderWithCost, fixing AssetUploader. add parsing of some | UbitUmarov | 2012-09-22 | 2 | -42/+28 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | more needed fields in request | |||||
| | | * | | | | removed unused data in MeshUploadFlag response | UbitUmarov | 2012-09-22 | 1 | -8/+8 | |
| | | | | | | | ||||||
| | | * | | | | 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.. | |||||
| | * | | | | add some locks to GetTextureModule | UbitUmarov | 2012-09-17 | 1 | -10/+13 | |
| | | | | | | ||||||
| | * | | | | 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 | |
| | | | | | | ||||||
| | * | | | | fix build | UbitUmarov | 2012-09-17 | 1 | -2/+2 | |
| | | | | | | ||||||
| | * | | | | missing file for suport of mesh upload cost | UbitUmarov | 2012-09-17 | 1 | -0/+596 | |
| | | | | | | ||||||
| | * | | | | add suport funtions for mesh upload costs | UbitUmarov | 2012-09-17 | 1 | -0/+1 | |
| | | | | | | ||||||
| | * | | | | Remove spammy "axislock" debug. | Melanie | 2012-09-17 | 1 | -1/+1 | |
| | | | | | | ||||||
| | * | | | | Make agent creation at destination asynchronous. Failures here are pretty | Melanie | 2012-09-16 | 1 | -1/+9 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | much guaranteed to be fatal and the few times this would dosconnect an agent are more than made up for by the increased throughput of replying and closing the connection vs. keeping it open during the heavy work. Also causes better feedback to the viewer as the time is now split between Requesting Teleport and Connectiong to Destination. | |||||
| | * | | | | Change the close tmeout from 2 to 3 seconds on teleport. This may | Melanie | 2012-09-16 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | prevent being logged out after a successful teleport. | |||||
| | * | | | | Make IncomingCloseChildAgent not send a stop packet. This may prevent | Melanie | 2012-09-16 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | a viewer from being logged out after an otherwise successful teleport. | |||||
| | * | | | | Make the agent being kicked a child agent first so there won't be a ghost | Melanie | 2012-09-16 | 1 | -1/+2 | |
| | | | | | | ||||||
| | * | | | | Catch a nullref in the code to suppress GetTexture warnign spam we can't | Melanie | 2012-09-16 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | do a thing about anyway. | |||||
| | * | | | | Sequence/throttle asset retrievals. | Melanie | 2012-09-14 | 2 | -37/+69 | |
| | | | | | | ||||||
| * | | | | | Remove a core undo call that we don't need. | Melanie | 2012-09-27 | 1 | -2/+0 | |
| | | | | | | ||||||
| * | | | | | Merge branch 'master' into careminster | Melanie | 2012-09-27 | 1 | -0/+1 | |
| |\ \ \ \ \ | | |_|_|/ | |/| | | | ||||||
| | * | | | | just testing to see if pcampbot is alive yet | nebadon | 2012-09-26 | 1 | -0/+1 | |
| | | |/ / | |/| | | ||||||
| * | | | | Merge commit '2bf42f30af5030890b8e3ff5bb29074a1f0e9085' into careminster | Melanie | 2012-09-27 | 0 | -0/+0 | |
| |\ \ \ \ | |/ / / | ||||||
| | * | | | Add MaxPrimsUndo config setting to [Startup] section of OpenSim.ini. | Justin Clark-Casey (justincc) | 2012-09-27 | 7 | -19/+20 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | This controls how many undo steps the simulator will store for each prim. Default is now 20 rather than 5 as it briefly was. The default number could be increased through this is a memory tradeoff which will scale with the number of prims in the sim and level of activity. | |||||
| | * | | | Don't store undo states if a scene object is manipulated when it is not in a ↵ | Justin Clark-Casey (justincc) | 2012-09-26 | 2 | -3/+26 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | scene. Adds regression test for this. | |||||
| | * | | | refactor: Change control structures in SOP.StoreUndoState() to reduce nesting. | Justin Clark-Casey (justincc) | 2012-09-26 | 1 | -45/+43 | |
| | | | | | ||||||
| | * | | | Make it possible to rescale SOGs when they are not in a scene. | Justin Clark-Casey (justincc) | 2012-09-26 | 2 | -34/+40 | |
| | | | | | ||||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |