Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-11-02 | 11 | -52/+89 |
|\ | |||||
| * | lock unique and uniqueReleased in same order when both locks are needed | UbitUmarov | 2012-11-02 | 1 | -20/+14 |
| | | |||||
| * | Merge branch 'avination' into ubitwork | UbitUmarov | 2012-10-30 | 10 | -32/+75 |
| |\ | |||||
| | * | Set the script state to new rez when a scriptis saved, rather than region start. | Melanie | 2012-10-28 | 1 | -1/+1 |
| | | | | | | | | | | | | Prevents CHANGED_REGION_RESTART being sent to scripts when saving. | ||||
| | * | Add a property to determine if a link set is stored in the database. Also, fix | Melanie | 2012-10-28 | 1 | -0/+13 |
| | | | | | | | | | | | | | | | a bug where "Force object permissive" god action would fail to reset child prim permissions. | ||||
| | * | Deep copy the collection of at_target objects so it can't be modified while | Melanie | 2012-10-28 | 1 | -1/+4 |
| | | | | | | | | | | | | it's being iterated | ||||
| | * | Merge branch 'ubitwork' into avination | Melanie | 2012-10-19 | 1 | -6/+11 |
| | |\ | |||||
| | * \ | Merge branch 'ubitwork' into avination | Melanie | 2012-10-19 | 2 | -24/+101 |
| | |\ \ | |||||
| | * | | | Remove redundant and annoyingly modal message box in upload processing. | Melanie | 2012-10-18 | 1 | -11/+11 |
| | | | | | |||||
| | * | | | Merge branch 'ubitwork' into avination | Melanie | 2012-10-17 | 22 | -1206/+2391 |
| | |\ \ \ | |||||
| | * | | | | Allow the console to be used by gods as well as region owners. | Melanie | 2012-10-17 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Fix perms when linking an object. Set root part perms to the perms | Melanie | 2012-10-14 | 5 | -15/+30 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of the link set to make the build floater behave consistently. Fixes permissions exploit introduced on 23 August. | ||||
| | * | | | | Allow bypassing perms dialog (console only) | Melanie | 2012-10-14 | 1 | -0/+4 |
| | | | | | | |||||
| | * | | | | Make texture sedning use only two threads to make things less harsh on bandwidth | Melanie | 2012-10-14 | 1 | -2/+2 |
| | | | | | | |||||
| | * | | | | Remove spammy debug for IM | Melanie | 2012-10-11 | 1 | -3/+3 |
| | | | | | | |||||
| | * | | | | Change permissions on child prim inventory items when god mode "force | Melanie | 2012-10-08 | 2 | -2/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | permissive" is used. | ||||
* | | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-10-28 | 1 | -2/+1 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | revert last change | UbitUmarov | 2012-10-28 | 1 | -2/+1 |
| | | | | | | |||||
* | | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-10-28 | 1 | -1/+2 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | fix ode timing | UbitUmarov | 2012-10-28 | 1 | -1/+2 |
| | | | | | | |||||
* | | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-10-28 | 1 | -0/+1 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | minor change | UbitUmarov | 2012-10-28 | 1 | -0/+1 |
| | | | | | | |||||
* | | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-10-28 | 1 | -8/+13 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | test limit ode exec time by time not number of loops done | UbitUmarov | 2012-10-28 | 1 | -8/+13 |
| | | | | | | |||||
* | | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-10-28 | 1 | -0/+2 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | more debug | UbitUmarov | 2012-10-28 | 1 | -0/+2 |
| | | | | | | |||||
* | | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-10-28 | 1 | -1/+1 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | remove pre physics build testing | UbitUmarov | 2012-10-28 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-10-28 | 1 | -1/+9 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Add some extra debug on scene close | UbitUmarov | 2012-10-28 | 1 | -1/+9 |
| | | | | | | |||||
* | | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-10-20 | 2 | -1/+3 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | bug fix | UbitUmarov | 2012-10-20 | 2 | -1/+3 |
| | | | | | | |||||
* | | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-10-19 | 2 | -23/+105 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | UbitOde stop doing a copy of the asset data using just the reference to | UbitUmarov | 2012-10-19 | 1 | -2/+3 |
| | |_|_|/ | |/| | | | | | | | | | | | | | it. It costs a lot of cpu and doesn't seem all that usefull. | ||||
| * | | | | [UNTESTED] core Ode: let broken mesh physical prims collide with land as | UbitUmarov | 2012-10-19 | 1 | -6/+11 |
| | |_|/ | |/| | | | | | | | | | | the defaul basic box so they don't go off world. | ||||
| * | | | [UNTESTED] core Ode: stop trying to load a broken asset. Make broken | UbitUmarov | 2012-10-19 | 1 | -21/+97 |
| | | | | | | | | | | | | | | | | assets behave like phantom by Nebadon request | ||||
* | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-10-18 | 1 | -3/+4 |
|\ \ \ \ | |/ / / | |||||
| * | | | extend coment to include all unused SOG CheckSculptAndLoad() | UbitUmarov | 2012-10-18 | 1 | -3/+4 |
| | |/ | |/| | |||||
* | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-10-16 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | coment a debug warning | UbitUmarov | 2012-10-16 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-10-16 | 3 | -67/+82 |
|\ \ \ | |/ / | |||||
| * | | fixes | UbitUmarov | 2012-10-16 | 3 | -67/+82 |
| | | | |||||
* | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-10-13 | 1 | -0/+2 |
|\ \ \ | |/ / | |||||
| * | | missing file | UbitUmarov | 2012-10-13 | 1 | -0/+2 |
| | | | |||||
* | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-10-13 | 4 | -3/+88 |
|\ \ \ | |/ / | |||||
| * | | add mesh cache expire on region startup. Expires will be relative to | UbitUmarov | 2012-10-13 | 4 | -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. | ||||
* | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-10-13 | 2 | -11/+21 |
|\ \ \ | |/ / | |||||
| * | | retouch mesh ids | UbitUmarov | 2012-10-13 | 2 | -11/+21 |
| | | | |||||
* | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-10-13 | 1 | -4/+8 |
|\ \ \ | |/ / | |||||
| * | | missing file (again) | UbitUmarov | 2012-10-13 | 1 | -4/+8 |
| | | |