Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork | UbitUmarov | 2012-03-09 | 133 | -1036/+2549 | |
| |\ \ \ \ | ||||||
* | | | | | | Fix UbitODE dll mappping by simply copying the one from ODE.Net | Melanie | 2012-03-09 | 3 | -6/+6 | |
| |_|/ / / |/| | | | | ||||||
* | | | | | Merge branch 'ubitwork' | Melanie | 2012-03-09 | 4 | -112/+194 | |
|\ \ \ \ \ | |/ / / / | ||||||
| * | | | | more changes on undo/redo group scaling seems to work better | UbitUmarov | 2012-03-09 | 2 | -14/+9 | |
| * | | | | more changes in undo/redo. Basicly moved control to llclientview.cs. later w... | UbitUmarov | 2012-03-09 | 3 | -100/+187 | |
* | | | | | Fix a merge artefact | Melanie | 2012-03-09 | 1 | -4/+5 | |
| |/ / / |/| | | | ||||||
* | | | | Merge branch 'master' into careminster | Melanie | 2012-03-09 | 5 | -93/+60 | |
|\ \ \ \ | | |/ / | |/| | | ||||||
| * | | | Simplify minimap coarse location code by just reference SP.AbsolutePosition | Justin Clark-Casey (justincc) | 2012-03-09 | 2 | -12/+3 | |
| * | | | Get rid of unnecessary ParentID == 0 check on SP.Get_AbsolutePosition since t... | Justin Clark-Casey (justincc) | 2012-03-09 | 1 | -2/+2 | |
| * | | | Use SP.ParentPart instead of ParentID in places where it's more efficient (sa... | Justin Clark-Casey (justincc) | 2012-03-09 | 4 | -68/+32 | |
| * | | | refactor: cleanup SP.HandleAgentSit so that everything is done within one if ... | Justin Clark-Casey (justincc) | 2012-03-09 | 1 | -15/+8 | |
| | |/ | |/| | ||||||
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2012-03-08 | 7 | -49/+798 | |
| |\ \ | ||||||
| | * | | Remove a race condition from SP.Set_AbsolutePosition where we assume the Pare... | Justin Clark-Casey (justincc) | 2012-03-09 | 1 | -5/+5 | |
| * | | | HG inventory/asset transfers: serialize asset posts. I'm using the same patte... | Diva Canto | 2012-03-08 | 1 | -1/+20 | |
* | | | | Merge branch 'master' into careminster | Melanie | 2012-03-09 | 0 | -0/+0 | |
|\ \ \ \ | | |/ / | |/| | | ||||||
| * | | | FireAndForget scripted rez - port from Avination | Melanie | 2012-03-09 | 1 | -41/+46 | |
* | | | | Merge branch 'master' into careminster | Melanie | 2012-03-09 | 6 | -5/+750 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-03-09 | 2 | -29/+32 | |
| |\ \ \ | | |/ / | ||||||
| | * | | Fixes mantis #5923 | Diva Canto | 2012-03-08 | 1 | -2/+3 | |
| * | | | Merge branch 'xassetservice' | Justin Clark-Casey (justincc) | 2012-03-09 | 5 | -3/+747 | |
| |\ \ \ | ||||||
| | * | | | minor: move some compression related var setup inside compression if/then switch | Justin Clark-Casey (justincc) | 2012-03-09 | 1 | -4/+3 | |
| | * | | | Put big fat EXPERIMENTAL warning in xassetservice database plugin | Justin Clark-Casey (justincc) | 2012-03-09 | 1 | -0/+10 | |
| | * | | | Switch to sha256 from sha1 in order to avoid future asset hash collisions. | Justin Clark-Casey (justincc) | 2012-03-06 | 3 | -10/+19 | |
| | * | | | remove unnecessary hash local variable | Justin Clark-Casey (justincc) | 2012-03-05 | 1 | -2/+0 | |
| | * | | | Make asset compression optional. Currently set to false and not configurable... | Justin Clark-Casey (justincc) | 2012-03-03 | 1 | -16/+24 | |
| | * | | | Implement basic gzip compression for xassetdata | Justin Clark-Casey (justincc) | 2012-03-03 | 1 | -10/+41 | |
| | * | | | If asset data already exists with the required hash then don't rewrite it | Justin Clark-Casey (justincc) | 2012-03-03 | 1 | -17/+59 | |
| | * | | | Perform asset storage transactionally | Justin Clark-Casey (justincc) | 2012-03-02 | 1 | -57/+69 | |
| | * | | | Merge branch 'master' into xassetservice | Justin Clark-Casey (justincc) | 2012-03-02 | 4 | -40/+34 | |
| | |\ \ \ | ||||||
| | * | | | | Make xassetservice execute one query to retrieve the asset, not two | Justin Clark-Casey (justincc) | 2012-03-02 | 1 | -28/+4 | |
| | * | | | | Merge branch 'master' into xassetservice | Justin Clark-Casey (justincc) | 2012-03-02 | 2 | -110/+55 | |
| | |\ \ \ \ | ||||||
| | * | | | | | Make XAssetService a de-duplicating asset service. | Justin Clark-Casey (justincc) | 2012-03-02 | 2 | -0/+443 | |
| | * | | | | | Start by adding XAssetService as a copy of the existing AssetService. | Justin Clark-Casey (justincc) | 2012-03-02 | 2 | -2/+218 | |
* | | | | | | | Merge branch 'master' into careminster | Melanie | 2012-03-08 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | ||||||
| * | | | | | | Hold a ref to the prim we're sat on rather than querying scene each time | Melanie | 2012-03-08 | 1 | -27/+29 | |
| |/ / / / / | ||||||
* | | | | | | Merge branch 'master' into careminster | Melanie | 2012-03-08 | 35 | -233/+326 | |
|\ \ \ \ \ \ | |/ / / / / | ||||||
| * | | | | | Move "change region" command into general category | Justin Clark-Casey (justincc) | 2012-03-08 | 1 | -1/+1 | |
| * | | | | | Uses shorter AddCommand form for "show estates" | Justin Clark-Casey (justincc) | 2012-03-08 | 1 | -1/+1 | |
| * | | | | | Display help commander topics in capitalized form - the commands themselves a... | Justin Clark-Casey (justincc) | 2012-03-08 | 3 | -45/+14 | |
| * | | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-03-08 | 1 | -4/+1 | |
| |\ \ \ \ \ | ||||||
| * | | | | | | Change "help" to display categories/module list then "help <category/module>"... | Justin Clark-Casey (justincc) | 2012-03-08 | 35 | -192/+316 | |
* | | | | | | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ... | Melanie | 2012-03-08 | 4 | -180/+96 | |
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | ||||||
| * | | | | | | Hold a ref to the prim we're sat on rather than querying scene each time | Melanie | 2012-03-08 | 1 | -27/+30 | |
| * | | | | | | changes on undo/redo (untested/incomplete). Think we may consider moving thi... | UbitUmarov | 2012-03-07 | 3 | -153/+66 | |
* | | | | | | | Merge branch 'master' into careminster | Melanie | 2012-03-07 | 5 | -22/+25 | |
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | ||||||
| * | | | | | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2012-03-07 | 4 | -20/+25 | |
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | ||||||
| | * | | | | | minor: make NPC tests run in a given order, comment out log lines in mock reg... | Justin Clark-Casey (justincc) | 2012-03-07 | 4 | -20/+25 | |
| * | | | | | | Always zero the PhysActor on dupes to prevent side effects on the orignal prim | Melanie | 2012-03-07 | 1 | -4/+1 | |
| |/ / / / / | ||||||
* | | | | | | Fix merge issue | Melanie | 2012-03-07 | 1 | -76/+79 | |
* | | | | | | Merge branch 'master' into careminster | Melanie | 2012-03-07 | 24 | -107/+453 | |
|\ \ \ \ \ \ | |/ / / / / |