aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'avination' into ubitworkUbitUmarov2012-10-041-1/+12
|\
| * Fix a viewer crash issueMelanie2012-10-031-1/+12
| |
* | more changes. Most code not in useUbitUmarov2012-10-045-23/+615
| |
* | missing changed fileUbitUmarov2012-10-031-1/+1
| |
* | meshworker basic replacement of SOP CheckSculptAndLoad ( for now disabledUbitUmarov2012-10-032-4/+41
| | | | | | | | for all physics engines)
* | making meshworker have more work..UbitUmarov2012-10-032-4/+23
| |
* | introduce a ODEMeshWorker class, should be pure cosmetic changes for nowUbitUmarov2012-10-037-163/+262
|/
* Attempt to fix Mantis #6311. Honor a destination folder if one is givenMelanie2012-10-021-0/+39
|
* Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkMelanie2012-09-284-57/+147
|\
| * make some forgotten changes be done by simulation thread not by callerUbitUmarov2012-09-272-34/+126
| |
| * Update the Http server with a few additional properties. Adapt the testMelanie2012-09-271-0/+4
| | | | | | | | server code to match.
| * Merge branch 'ubitwork' into avinationMelanie2012-09-261-5/+1
| |\
| * | Streamline and improve llGetMassMelanie2012-09-261-23/+17
| | |
* | | Fix a possible NREMelanie2012-09-281-3/+10
| |/ |/|
* | create a new PollServiceHttpRequest req per loop since they can be sent toUbitUmarov2012-09-271-5/+1
|/ | | | another working thread
* don't send a partial contents report if we are sending all dataUbitUmarov2012-09-261-10/+15
|
* add assettype mesh to list of binary assetsUbitUmarov2012-09-261-1/+2
|
* fix GetTextureHandler rangeUbitUmarov2012-09-261-1/+5
|
* missing fileUbitUmarov2012-09-261-1/+1
|
* just remove the damm thingUbitUmarov2012-09-267-29/+7
|
* Seems nothing actually need the request body for getevents. so changeUbitUmarov2012-09-265-15/+12
| | | | control flag to false
* UriModule GetEvents also doesn't need a request bodyUbitUmarov2012-09-261-0/+1
|
* keep watchdog happy using it to kill his threadsUbitUmarov2012-09-261-9/+1
|
* more changes to PollServiceUbitUmarov2012-09-264-25/+25
|
* fix priorityQueue to correctly use the fairness counts starting at 8 forUbitUmarov2012-09-261-10/+10
| | | | | nonimediate queues. Imediate queues where not taken into account so it was unused.
* missed changeUbitUmarov2012-09-251-1/+2
|
* do the same to webFecthInvDescModuleUbitUmarov2012-09-251-33/+25
|
* change GetTextureModule processingUbitUmarov2012-09-251-29/+31
|
* Text changes for upload messagesMelanie2012-09-241-4/+4
|
* more upload changes (plus untouch prebuild.xml)UbitUmarov2012-09-242-68/+128
|
* add missing transactionID in SendInventoryItemCreateUpdate. and make useUbitUmarov2012-09-247-7/+38
| | | | | of it on inventoryAccessModule, etc. Most likelly it's needs where there is a transactionID not zero
* 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-231-7/+38
|\ \ | |/
| * Change the poll service to use a thread pool for replies to make sure theMelanie2012-09-231-7/+38
| | | | | | | | 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.