aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-10-052-16/+29
|\ \ \ | |/ /
| * | Merge branch 'avination' into ubitworkUbitUmarov2012-10-052-16/+29
| |\ \ | | |/
| | * Allow default animation to be stopped to be replaced with another one.Melanie2012-10-042-16/+29
| | | | | | | | | | | | Fixes Mantis #6327
* | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-10-044-29/+144
|\ \ \ | |/ /
| * | more changes and more non active codeUbitUmarov2012-10-044-29/+144
| | |
* | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-10-041-1/+1
|\ \ \ | |/ /
| * | apply cmic fix to multi layer wearablesUbitUmarov2012-10-041-1/+1
| | |
* | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-10-041-1/+12
|\ \ \ | |/ /
| * | Merge branch 'avination' into ubitworkUbitUmarov2012-10-041-1/+12
| |\ \ | | |/
| | * Fix a viewer crash issueMelanie2012-10-031-1/+12
| | |
* | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-10-045-23/+615
|\ \ \ | |/ /
| * | more changes. Most code not in useUbitUmarov2012-10-045-23/+615
| | |
* | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-10-041-1/+1
|\ \ \ | |/ /
| * | missing changed fileUbitUmarov2012-10-031-1/+1
| | |
* | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-10-042-4/+41
|\ \ \ | |/ /
| * | meshworker basic replacement of SOP CheckSculptAndLoad ( for now disabledUbitUmarov2012-10-032-4/+41
| | | | | | | | | | | | for all physics engines)
* | | 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-283-57/+143
| |\
| * | Fix a possible NREMelanie2012-09-281-3/+10
| | |
* | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-283-57/+143
|\ \ \ | | |/ | |/|
| * | make some forgotten changes be done by simulation thread not by callerUbitUmarov2012-09-272-34/+126
| | |
| * | Streamline and improve llGetMassMelanie2012-09-261-23/+17
| |/
* | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-264-4/+4
|\ \ | |/
| * just remove the damm thingUbitUmarov2012-09-264-4/+4
| |
* | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-262-11/+2
|\ \ | |/
| * Seems nothing actually need the request body for getevents. so changeUbitUmarov2012-09-263-12/+2
| | | | | | | | control flag to false
| * UriModule GetEvents also doesn't need a request bodyUbitUmarov2012-09-261-0/+1
| |
* | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-262-1/+7
|\ \ | |/
| * more changes to PollServiceUbitUmarov2012-09-262-1/+7
| |
* | 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-242-68/+128
|\ \ | |/
| * more upload changes (plus untouch prebuild.xml)UbitUmarov2012-09-242-68/+128
| |
* | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-2412-68/+104
|\ \ | |/
| * add missing transactionID in SendInventoryItemCreateUpdate. and make useUbitUmarov2012-09-245-7/+33
| | | | | | | | | | 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.
| * | 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-233-203/+373
| |\ \ | | |/ | | | | | | | | | 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
| | |
| * | Change texture price back to 10 C$Melanie2012-09-191-3/+2
| | |
generated by cgit v1.1 at 2024-12-23 16:28:22 +0000