aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Expand)AuthorAgeFilesLines
...
* | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-232-41/+210
|\ \ \ | | |/ | |/|
| * | try to allow free uploads for testing, if users prefix names with "TEST-". LetUbitUmarov2012-09-232-41/+210
* | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-222-29/+75
|\ \ \ | |/ /
| * | report asset upload errors the right awayUbitUmarov2012-09-222-29/+75
* | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-221-42/+24
|\ \ \ | |/ /
| * | removed AssetUploaderWithCost, fixing AssetUploader. add parsing of someUbitUmarov2012-09-221-42/+24
* | | 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-178-53/+208
|\ \ | |/
| * Remove spammy "axislock" debug.Melanie2012-09-171-1/+1
| * 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
| * Revamp the HTTP textures handler to allow a maximum of four fetchesMelanie2012-09-141-44/+179
| * 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
| * 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-173-305/+87
|\ \ | |/
| * Add a missing brace, remove a useless temp variable, enable charging.Melanie2012-09-111-6/+3
| * report mesh upload costs ( fake values)UbitUmarov2012-09-111-2/+46
| * let LLSDAssetUploadRequest include asset_resources information plus letUbitUmarov2012-09-111-0/+1
| * Removing the variable prica handler again. It's never called, was misnamed andMelanie2012-09-111-332/+0
| * Re-add the module and fix a typoMelanie2012-09-111-0/+332