aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-10-032-4/+23
|\
| * making meshworker have more work..UbitUmarov2012-10-032-4/+23
| |
* | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-10-039-166/+311
|\ \ | |/
| * 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-285-57/+147
| |\
| * | Fix a possible NREMelanie2012-09-281-3/+10
| | |
* | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-285-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-272-0/+4
| | | | | | | | | | | | server code to match.
| * | Merge branch 'ubitwork' into avinationMelanie2012-09-261-5/+1
| |\ \ | | |/
| * | Streamline and improve llGetMassMelanie2012-09-261-23/+17
| | |
* | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-271-5/+1
|\ \ \ | | |/ | |/|
| * | create a new PollServiceHttpRequest req per loop since they can be sent toUbitUmarov2012-09-271-5/+1
| |/ | | | | | | another working thread
* | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-262-11/+17
|\ \ | |/
| * 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
| |
* | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-261-1/+5
|\ \ | |/
| * fix GetTextureHandler rangeUbitUmarov2012-09-261-1/+5
| |
* | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-261-1/+1
|\ \ | |/
| * missing fileUbitUmarov2012-09-261-1/+1
| |
* | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-267-29/+7
|\ \ | |/
| * just remove the damm thingUbitUmarov2012-09-267-29/+7
| |
* | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-264-23/+13
|\ \ | |/
| * 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
| |
* | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-265-35/+35
|\ \ | |/
| * 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.
* | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-253-67/+62
|\ \ | |/
| * 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
| |
* | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-243-69/+128
|\ \ | |/
| * more upload changes (plus untouch prebuild.xml)UbitUmarov2012-09-243-69/+128
| |
* | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-241-0/+1
|\ \ | |/
| * touch prebuild.xmlUbitUmarov2012-09-241-0/+1
| |
* | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-2416-75/+148
|\ \ | |/
| * 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-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
| * | refix prior commitMelanie2012-09-201-1/+1
| | |
| * | Make uploads free for now - we will have to announce thisMelanie2012-09-201-3/+6
| | |
generated by cgit v1.1 at 2024-12-19 04:09:54 +0000