aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-2415-75/+147
|\
| * add missing transactionID in SendInventoryItemCreateUpdate. and make useUbitUmarov2012-09-247-7/+38
| * 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
| * | Protect the responses map with a lock. Also remove ugly "this." type ofMelanie2012-09-232-18/+24
| * | 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
| * | Comment out asset error for sculpts/meshes. If an asset is missing it's missing.Melanie2012-09-231-4/+4
| * | Merge branch 'ubitwork' into avinationMelanie2012-09-236-203/+390
| |\ \ | | |/
| * | 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
* | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-233-41/+211
|\ \ \ | | |/ | |/|
| * | try to allow free uploads for testing, if users prefix names with "TEST-". LetUbitUmarov2012-09-233-41/+211
* | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-224-29/+87
|\ \ \ | |/ /
| * | report asset upload errors the right awayUbitUmarov2012-09-224-29/+87
* | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-222-42/+28
|\ \ \ | |/ /
| * | removed AssetUploaderWithCost, fixing AssetUploader. add parsing of someUbitUmarov2012-09-222-42/+28
* | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-223-12/+31
|\ \ \ | |/ /
| * | removed unused data in MeshUploadFlag responseUbitUmarov2012-09-221-8/+8
| * | read model upload cost parameters from config [Economy] sectionUbitUmarov2012-09-212-4/+23
* | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-211-103/+56
|\ \ \ | |/ /
| * | Fix model upload rotations and offsets ( i hope )UbitUmarov2012-09-201-103/+56
| |/
* | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-192-16/+82
|\ \ | |/
| * be more tolerant to small prims, skipping them, only failing if they areUbitUmarov2012-09-192-16/+82
* | 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
| * coment out mesh model upload code to add textures and individual meshsUbitUmarov2012-09-192-204/+255
* | 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 meshs....UbitUmarov2012-09-181-7/+76
| * 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
| * 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
* | 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
| * Change the close tmeout from 2 to 3 seconds on teleport. This mayMelanie2012-09-161-1/+1
| * Make IncomingCloseChildAgent not send a stop packet. This may preventMelanie2012-09-161-1/+1
| * Make the agent being kicked a child agent first so there won't be a ghostMelanie2012-09-161-1/+2