aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-192-217/+310
|\ \ | |/
| * 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.
* | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-181-2/+4
|\ \ | |/
| * Add booleans to control whether we actually crete inventory itemsMelanie2012-09-181-2/+4
| |
* | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-183-63/+169
|\ \ | |/
| * ***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
| |
* | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-171-15/+1
|\ \ | |/
| * removed broken fee compressionUbitUmarov2012-09-171-15/+1
| |
* | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-171-22/+22
|\ \ | |/
| * let mesh model estimator work even without money module, so otherUbitUmarov2012-09-171-22/+22
| | | | | | | | estimations can work
* | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-172-24/+13
|\ \ | |/
| * Make use of mesh cost functionsUbitUmarov2012-09-172-24/+13
| |
* | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-171-0/+596
|\ \ | |/
| * missing file for suport of mesh upload costUbitUmarov2012-09-171-0/+596
| |
* | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-1717-208/+425
|\ \ | |/
| * 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
| |
| * Revamp the HTTP textures handler to allow a maximum of four fetchesMelanie2012-09-147-158/+295
| | | | | | | | at any time and to drop requests for avatars n longer in the scene
| * Allow setting connection limits, part 2Melanie2012-09-141-0/+20
| |
| * Allow some more connections to try to ease lag.Melanie2012-09-142-2/+4
| |
| * Wait longer for arrival cofirmation to aid tps into laggy regionsMelanie2012-09-141-2/+2
| |
| * Wait a bit longer for new scene presences to aid tps into laggy regionsMelanie2012-09-141-1/+1
| |
| * Allow setting max connections for an endpointMelanie2012-09-142-3/+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
| |
* | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-175-307/+119
|\ \ | |/
| * Add a missing brace, remove a useless temp variable, enable charging.Melanie2012-09-111-6/+3
| |
| * report mesh upload costs ( fake values)UbitUmarov2012-09-112-3/+68
| |
| * let LLSDAssetUploadRequest include asset_resources information plus letUbitUmarov2012-09-112-1/+11
| | | | | | | | NewAgentInventoryRequest know about mesh (does nothing with it still)
| * Removing the variable prica handler again. It's never called, was misnamed andMelanie2012-09-111-332/+0
| | | | | | | | probably never worked past the mesh beta.
| * Re-add the module and fix a typoMelanie2012-09-111-0/+332
| |
| * Rename NewFileAgentInventoryVariablePrice to NewAgentInventoryVariablePriceMelanie2012-09-111-332/+0
| | | | | | | | which is the name actually used in viewer code.
| * Add cost calculation suppor tto the VariablePrice one as wellMelanie2012-09-112-9/+44
| |
| * Revert "Remove the unused NewFileAgentInventoryVariablePrice module."Melanie2012-09-111-0/+296
| | | | | | | | | | | | It's actually used. This reverts commit 94a8e5572b1529190a174f29f866b65e7b2ccc0e.
| * Add the option to have variable costing for uploadsMelanie2012-09-112-9/+46
| |
| * Remove the unused NewFileAgentInventoryVariablePrice module.Melanie2012-09-111-296/+0
| |
* | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-114-93/+123
|\ \ | |/
| * Revamp the v3 inventory sending. Uses threads and some nifty mechanics toMelanie2012-09-111-81/+117
| | | | | | | | leverage the Poll Service without blocking it's workers.
| * Remove commented codeMelanie2012-09-101-11/+0
| |