aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-10-183-37/+102
|\
| * minor: Convert ad-hoc list building in ObjectCommandsModule to use ↵Justin Clark-Casey (justincc)2012-10-181-21/+24
| | | | | | | | ConsoleDisplayList
| * Add local and UUID to information output of "show object" and "show part" ↵Justin Clark-Casey (justincc)2012-10-181-0/+4
| | | | | | | | region console commands
| * Add --full option to "show object name/uuid/pos" to show info on all parts ↵Justin Clark-Casey (justincc)2012-10-181-20/+60
| | | | | | | | of an object, not just whole object summary information.
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-10-185-40/+70
| |\
| * | Add number of inventory items to information displayed via "show part" ↵Justin Clark-Casey (justincc)2012-10-183-3/+21
| | | | | | | | | | | | console command
* | | Merge branch 'master' into careminsterMelanie2012-10-180-0/+0
|\ \ \ | | |/ | |/|
| * | Remove extraneous calls to the now commented CheckSculptAndLoadMelanie2012-10-181-24/+0
| | |
| * | extend coment to include all unused SOG CheckSculptAndLoad()UbitUmarov2012-10-181-3/+4
| | |
| * | [DANGER UNTESTED] ODE mesh assets. Other plugins will not do meshs/sculptsUbitUmarov2012-10-182-14/+18
| | | | | | | | | | | | | | | | | | now Signed-off-by: Melanie <melanie@t-data.com>
| * | missing changed fileUbitUmarov2012-10-181-1/+1
| | | | | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com>
| * | i update core ode plugin and make it load is meshs (i hope)UbitUmarov2012-10-182-2/+51
| |/ | | | | | | Signed-off-by: Melanie <melanie@t-data.com>
* | Merge branch 'avination' into careminsterMelanie2012-10-1823-1206/+2339
|\ \ | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/WebUtil.cs OpenSim/Region/Physics/OdePlugin/OdeScene.cs
| * | Remove redundant and annoyingly modal message box in upload processing.Melanie2012-10-181-11/+11
| | |
| * | Merge branch 'ubitwork' into avinationMelanie2012-10-1722-1206/+2391
| |\ \
| | * | coment a debug warningUbitUmarov2012-10-161-1/+1
| | | |
| | * | fixesUbitUmarov2012-10-163-67/+82
| | | |
| | * | missing fileUbitUmarov2012-10-131-0/+2
| | | |
| | * | add mesh cache expire on region startup. Expires will be relative toUbitUmarov2012-10-134-3/+88
| | | | | | | | | | | | | | | | | | | | | | | | previus expire (assumed done only once at startup). File 'cntr' on cache folder stores time. Deleting it will force a skip on expire. Default time is 48hours before previus startup to account for failed ones etc.
| | * | retouch mesh idsUbitUmarov2012-10-132-11/+21
| | | |
| | * | missing file (again)UbitUmarov2012-10-131-4/+8
| | | |
| | * | longer meshs identification keys, so first part on disk cache is it's asset idUbitUmarov2012-10-131-1/+3
| | | |
| | * | missing fileUbitUmarov2012-10-121-0/+6
| | | |
| | * | [TEST] disk cache meshsUbitUmarov2012-10-123-282/+532
| | | |
| | * | commit the right files!UbitUmarov2012-10-122-5737/+4763
| | | |
| | * | remove some more debug spam on odeUbitUmarov2012-10-122-4766/+5735
| | | |
| | * | normalize quaternion.Slerp outputsUbitUmarov2012-10-102-0/+2
| | | |
| | * | add some quaternion normalizations to keep errors under controlUbitUmarov2012-10-101-0/+3
| | | |
| | * | debugUbitUmarov2012-10-101-0/+6
| | | |
| | * | fix debug :)UbitUmarov2012-10-091-1/+1
| | | |
| | * | debug...UbitUmarov2012-10-091-0/+5
| | | |
| | * | debug...UbitUmarov2012-10-091-2/+5
| | | |
| | * | avoid crashing so debug is seenUbitUmarov2012-10-091-0/+1
| | | |
| | * | another debug msgUbitUmarov2012-10-091-0/+22
| | | |
| | * | force allocation of mesh data on creation ( messy code version )UbitUmarov2012-10-099-12/+45
| | | |
| | * | temporary debug codeUbitUmarov2012-10-091-0/+19
| | | |
| | * | fire a extra terseupdate when stopping (like in loosing physics). In someUbitUmarov2012-10-091-0/+3
| | | | | | | | | | | | | | | | cases things seem not to stop
| | * | Change ray to land colision range limitation so it has no impact on otherUbitUmarov2012-10-091-6/+8
| | | | | | | | | | | | | | | | geom types
| | * | move terrain geom to own ode space. Limit range on raycast if includesUbitUmarov2012-10-094-83/+229
| | | | | | | | | | | | | | | | | | | | | | | | terrain until ode doesn't eat all stack. Add a pre-simulation method to do pending actors changes (except mesh assets still not ready to use), to be optionaly called before firing heartbeat. [UNTESTED]
| | * | a few changes/fix (?)UbitUmarov2012-10-074-117/+112
| | | |
| | * | bug fix + make costs visible for testingUbitUmarov2012-10-074-41/+85
| | | |
| | * | refix so we can compile it, loosing alpha scultps fix on core meshmerizerUbitUmarov2012-10-071-0/+11
| | | |
| | * | fix wrong file commitedUbitUmarov2012-10-071-10/+0
| | | |
| | * | Merge branch 'avination' into ubitworkUbitUmarov2012-10-071-24/+7
| | |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Physics/Meshing/Meshmerizer.cs
| | | * | comment out a spam coment on core MeshmerizerUbitUmarov2012-10-071-26/+4
| | | | |
| | * | | i update core ode plugin and make it load is meshs (i hope)UbitUmarov2012-10-073-24/+118
| | | | |
| | * | | [DANGER UNTESTED] ODE mesh assets. Other plugins will not do meshs/sculptsUbitUmarov2012-10-077-1052/+632
| | | | | | | | | | | | | | | | | | | | now
| | * | | Merge branch 'avination' into ubitworkUbitUmarov2012-10-053-32/+50
| | |\ \ \ | | | |/ /
| | * | | make sure a buffer is closed, and changed a misleading log msgUbitUmarov2012-10-051-8/+20
| | | | |
| | * | | more changes and more non active codeUbitUmarov2012-10-044-29/+144
| | | | |
generated by cgit v1.1 at 2024-12-20 00:19:31 +0000