aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | Merge branch 'ubitwork' into avinationMelanie2012-09-244-37/+38
| |\ \ \ \
| | * | | | If an asset upload transaction doesn't exist for a CreateInventory request,Melanie2012-09-244-37/+38
| | | | | | | | | | | | | | | | | | | | | | | | simply process it as if UUID.Zero had been given.
| * | | | | Protect the responses map with a lock. Also remove ugly "this." type ofMelanie2012-09-232-18/+24
| | | | | | | | | | | | | | | | | | | | | | | | member notation.
| * | | | | Merge branch 'ubitwork' into avinationMelanie2012-09-232-7/+39
| |\ \ \ \ \ | | |/ / / /
| | * | | | Change the poll service to use a thread pool for replies to make sure theMelanie2012-09-232-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.Melanie2012-09-231-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | We can't put it back so we don't need to know.
| * | | | | Merge branch 'ubitwork' into avinationMelanie2012-09-236-203/+390
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/MeshCost.cs
| | * | | | try to allow free uploads for testing, if users prefix names with "TEST-". LetUbitUmarov2012-09-233-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 awayUbitUmarov2012-09-224-29/+87
| | | | | |
| | * | | | removed AssetUploaderWithCost, fixing AssetUploader. add parsing of someUbitUmarov2012-09-222-42/+28
| | | | | | | | | | | | | | | | | | | | | | | | more needed fields in request
| | * | | | removed unused data in MeshUploadFlag responseUbitUmarov2012-09-221-8/+8
| | | | | |
| | * | | | 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..
| * | | | add some locks to GetTextureModuleUbitUmarov2012-09-171-10/+13
| | | | |
| * | | | 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
| | | | |
| * | | | fix buildUbitUmarov2012-09-171-2/+2
| | | | |
| * | | | missing file for suport of mesh upload costUbitUmarov2012-09-171-0/+596
| | | | |
| * | | | add suport funtions for mesh upload costsUbitUmarov2012-09-171-0/+1
| | | | |
| * | | | Remove spammy "axislock" debug.Melanie2012-09-171-1/+1
| | | | |
| * | | | Make agent creation at destination asynchronous. Failures here are prettyMelanie2012-09-161-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 mayMelanie2012-09-161-1/+1
| | | | | | | | | | | | | | | | | | | | prevent being logged out after a successful teleport.
| * | | | Make IncomingCloseChildAgent not send a stop packet. This may preventMelanie2012-09-161-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 ghostMelanie2012-09-161-1/+2
| | | | |
| * | | | Catch a nullref in the code to suppress GetTexture warnign spam we can'tMelanie2012-09-161-1/+1
| | | | | | | | | | | | | | | | | | | | do a thing about anyway.
| * | | | Sequence/throttle asset retrievals.Melanie2012-09-142-37/+69
| | | | |
* | | | | Remove a core undo call that we don't need.Melanie2012-09-271-2/+0
| | | | |
* | | | | Merge branch 'master' into careminsterMelanie2012-09-271-0/+1
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | just testing to see if pcampbot is alive yetnebadon2012-09-261-0/+1
| | |/ / | |/| |
* | | | Merge commit '2bf42f30af5030890b8e3ff5bb29074a1f0e9085' into careminsterMelanie2012-09-270-0/+0
|\ \ \ \ | |/ / /
| * | | Add MaxPrimsUndo config setting to [Startup] section of OpenSim.ini.Justin Clark-Casey (justincc)2012-09-277-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-262-3/+26
| | | | | | | | | | | | | | | | | | | | | | | | scene. Adds regression test for this.
| * | | refactor: Change control structures in SOP.StoreUndoState() to reduce nesting.Justin Clark-Casey (justincc)2012-09-261-45/+43
| | | |
| * | | Make it possible to rescale SOGs when they are not in a scene.Justin Clark-Casey (justincc)2012-09-262-34/+40
| | | |
* | | | Make it possible to rescale SOGs when they are not in a scene.Justin Clark-Casey (justincc)2012-09-272-31/+42
| | | |
* | | | Merge commit '327320d1a7acbba969d26c281f92f64ce8ff365f' into careminsterMelanie2012-09-270-0/+0
|\ \ \ \ | |/ / /
| * | | Enforce existing 5 action hardcoded undo limit.Justin Clark-Casey (justincc)2012-09-263-27/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This was present in the code but not enforced, which led to a memory leak over time as part properties were changed, whether by viewer, script or another source. This commit enforces that limit, which will soon become configurable. Regression test for undo limit added Should help with http://opensimulator.org/mantis/view.php?id=6279
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-09-267-12/+41
| |\ \ \ | | | |/ | | |/|
generated by cgit v1.1 at 2024-12-23 04:28:26 +0000