Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | | | 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 | |
|\ \ \ \ \ \ | |/ / / / / | ||||||
| * | | | | | Stop individually deleting objects at the end of each ObjectTortureTest. | Justin Clark-Casey (justincc) | 2012-03-07 | 5 | -35/+36 | |
| * | | | | | Add documentation to make more explicit the difference between OnRezScript an... | Justin Clark-Casey (justincc) | 2012-03-07 | 1 | -5/+20 | |
| * | | | | | Remove static m_MainInstance in LocalGridServiceConnector. | Justin Clark-Casey (justincc) | 2012-03-06 | 1 | -24/+10 | |
| * | | | | | Add sensor, dataserver requests, timer and listener counts to "xengine status... | Justin Clark-Casey (justincc) | 2012-03-06 | 8 | -12/+136 | |
| * | | | | | Remove unnecessary explicit ElapsedEventHandler in SimReporter | Justin Clark-Casey (justincc) | 2012-03-06 | 1 | -1/+1 | |
| * | | | | | Explictly close down the StatsReporter so that we can shutdown its timer | Justin Clark-Casey (justincc) | 2012-03-06 | 2 | -0/+8 | |
| * | | | | | Fix TestSyntaxError() and TestSyntaxErrorDeclaringVariableInForLoop() | Justin Clark-Casey (justincc) | 2012-03-06 | 1 | -8/+14 | |
| * | | | | | Get all test methods in OpenSim.Region.ScriptEngine.Tests.dll to report that ... | Justin Clark-Casey (justincc) | 2012-03-06 | 8 | -26/+228 | |
* | | | | | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ... | Melanie | 2012-03-07 | 10 | -803/+871 | |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | ||||||
| * | | | | | Prevent scripted region crossings from crashing with prim limits enabled | Melanie | 2012-03-06 | 1 | -1/+7 | |
| * | | | | | Null PhysActor on SOP.Copy() to prevent clobbering the original one | Melanie | 2012-03-06 | 1 | -4/+3 | |
| * | | | | | Removed some whitespace errors - don't be naughty, don't use hard tabs! | Melanie | 2012-03-06 | 1 | -11/+0 | |
| * | | | | | make copied parts have diferent LocalIds than original. More building control... | UbitUmarov | 2012-03-06 | 2 | -5/+74 | |
| * | | | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork | UbitUmarov | 2012-03-06 | 3 | -7/+27 | |
| |\ \ \ \ \ | ||||||
| * | | | | | | update ubitOde | UbitUmarov | 2012-03-05 | 4 | -78/+297 | |
| * | | | | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork | UbitUmarov | 2012-03-05 | 2 | -3/+15 | |
| |\ \ \ \ \ \ | ||||||
| * | | | | | | | update UbitOde | UbitUmarov | 2012-03-04 | 5 | -65/+69 | |
| * | | | | | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork | UbitUmarov | 2012-03-04 | 1 | -0/+2 | |
| |\ \ \ \ \ \ \ | ||||||
| * | | | | | | | | update UbitODE | UbitUmarov | 2012-03-04 | 3 | -36/+55 | |
| * | | | | | | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork | UbitUmarov | 2012-03-03 | 1 | -5/+3 | |
| |\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | update ubitODE | UbitUmarov | 2012-03-02 | 1 | -15/+45 | |
| * | | | | | | | | | ubitODE bug fix | UbitUmarov | 2012-02-29 | 1 | -1/+1 | |
| * | | | | | | | | | update ubitODE to current working state | UbitUmarov | 2012-02-29 | 2 | -113/+199 | |
| * | | | | | | | | | fix | UbitUmarov | 2012-02-29 | 1 | -1/+3 | |
| * | | | | | | | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork | UbitUmarov | 2012-02-29 | 3 | -0/+28 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | chODE: bad meshs get a a basic box or sphere geom with setted prim size. They... | UbitUmarov | 2012-02-29 | 2 | -503/+148 | |
* | | | | | | | | | | | Merge branch 'master' into careminster | Melanie | 2012-03-06 | 2 | -62/+57 | |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / | |/| | | | | | | | | | ||||||
| * | | | | | | | | | | Fix off by one error in script error reporting. | Justin Clark-Casey (justincc) | 2012-03-06 | 1 | -1/+1 | |
| * | | | | | | | | | | Simplify NPCModuleTests code by putting the NPCModule in an instance variable... | Justin Clark-Casey (justincc) | 2012-03-06 | 1 | -61/+56 | |
* | | | | | | | | | | | Merge branch 'master' into careminster | Melanie | 2012-03-06 | 2 | -12/+57 | |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |