| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into careminster | Melanie | 2012-03-09 | 1 | -2/+5 |
| |\ | |||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-03-09 | 1 | -27/+29 |
| | |\ | |||||
| | | * | Hold a ref to the prim we're sat on rather than querying scene each time | Melanie | 2012-03-08 | 1 | -27/+29 |
| | | | | | | | | | | | | | the check for significant is carried out. Prevents a deadlock condition. | ||||
| | * | | Merge branch 'xassetservice' | Justin Clark-Casey (justincc) | 2012-03-09 | 1 | -2/+5 |
| | |\ \ | | |/ | |/| | |||||
| | | * | Merge branch 'master' into xassetservice | Justin Clark-Casey (justincc) | 2012-03-02 | 4 | -40/+34 |
| | | |\ | |||||
| | | * \ | Merge branch 'master' into xassetservice | Justin Clark-Casey (justincc) | 2012-03-02 | 2 | -110/+55 |
| | | |\ \ | |||||
| | | * | | | Start by adding XAssetService as a copy of the existing AssetService. | Justin Clark-Casey (justincc) | 2012-03-02 | 1 | -2/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the start of exploring the creation of a bundled OpenSimulator asset service that does de-duplication and possibly file storage of assets. Along the lines of coyled's SRAS, but not intended to replace, merely to act as a more performant bundled default. Might end up nicking stuff from kcozen's patch at http://opensimulator.org/mantis/view.php?id=5429 More details at http://opensimulator.org/wiki/Feature_Proposals/Deduplicating_Asset_Service Feedback and discussion welcome as commits are made. | ||||
| * | | | | | Merge branch 'master' into careminster | Melanie | 2012-03-08 | 26 | -184/+206 |
| |\ \ \ \ \ | |/ / / / | |||||
| | * | | | | 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 ↵ | Justin Clark-Casey (justincc) | 2012-03-08 | 3 | -45/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | are still lowercase. Also convert the estate commands to simply AddCommand() calls so that commands from two different modules can be placed in the same category | ||||
| | * | | | | 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 ↵ | Justin Clark-Casey (justincc) | 2012-03-08 | 26 | -143/+196 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | <category/module>" to display commands in a category. This is to deal with the hundred lines of command splurge when one previously typed "help" Modelled somewhat on the mysql console One can still type help <command> to get per command help at any point. Categories capitalized to avoid conflict with the all-lowercase commands (except for commander system, as of yet). Does not affect command parsing or any other aspects of the console apart from the help system. Backwards compatible with existing modules. | ||||
| * | | | | | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵ | Melanie | 2012-03-08 | 4 | -180/+96 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | careminster | ||||
| | * | | | | | | Hold a ref to the prim we're sat on rather than querying scene each time | Melanie | 2012-03-08 | 1 | -27/+30 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the check for significant is carried out. Prevents a deadlock condition. | ||||
| | * | | | | | | changes on undo/redo (untested/incomplete). Think we may consider moving ↵ | UbitUmarov | 2012-03-07 | 3 | -153/+66 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this mfrom SOP to client side. At least does seem to work a bit better ( again there wwas a issue on sop.copy ) | ||||
| * | | | | | | | Merge branch 'master' into careminster | Melanie | 2012-03-07 | 1 | -2/+0 |
| |\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | ||||
| | * | | | | | | 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 | 20 | -100/+438 |
| |\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | ||||
| | * | | | | | Stop individually deleting objects at the end of each ObjectTortureTest. | Justin Clark-Casey (justincc) | 2012-03-07 | 1 | -28/+21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can now do this since the entire scene and all objects within it are now successfully gc'd at the end of these tests. This greatly improves the time taken to run each test (by reducing teardown time, not the time to actually do the test work that we're interested in). Slightly simplifies config read in Scene constructor to help facilitate this. | ||||
| | * | | | | | Add documentation to make more explicit the difference between OnRezScript ↵ | Justin Clark-Casey (justincc) | 2012-03-07 | 1 | -5/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and OnNewScript in the event manager OnNewScript fires when a script is added to a scene OnRezScript fires when the script actually runs (i.e. after permission checks, state retrieval, etc.) | ||||
| | * | | | | | Remove static m_MainInstance in LocalGridServiceConnector. | Justin Clark-Casey (justincc) | 2012-03-06 | 1 | -24/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I believe this was originally required back when there could be two LocalGridServiceConnectors but this is no longer the case. Having such statics makes performance testing much more difficult since they prevent GC of objects unless static references are explicitly nulled. | ||||
| | * | | | | | Add sensor, dataserver requests, timer and listener counts to "xengine ↵ | Justin Clark-Casey (justincc) | 2012-03-06 | 8 | -12/+136 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | status" command. This is for diagnostic purposes. | ||||
| | * | | | | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | | This is another step necessary for the scene to be garbage collected between performance tests | ||||
| | * | | | | | Fix TestSyntaxError() and TestSyntaxErrorDeclaringVariableInForLoop() | Justin Clark-Casey (justincc) | 2012-03-06 | 1 | -8/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They were all failing assertions but the exceptions these threw were caught as expected Exceptions. I don't think we can easily distinguish these from the Exceptions that we're expecting. So for now we'll do some messy manually checking with boolean setting instead. This patch also corrects the assertions themselves. | ||||
| | * | | | | | Get all test methods in OpenSim.Region.ScriptEngine.Tests.dll to report that ↵ | Justin Clark-Casey (justincc) | 2012-03-06 | 8 | -26/+228 |
| | | | | | | | | | | | | | | | | | | | | | | | | | they're running | ||||
| * | | | | | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵ | Melanie | 2012-03-07 | 10 | -803/+871 |
| |\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | careminster | ||||
| | * | | | | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Also removed commented code block. | ||||
| | * | | | | | make copied parts have diferent LocalIds than original. More building ↵ | UbitUmarov | 2012-03-06 | 2 | -5/+74 |
| | | | | | | | | | | | | | | | | | | | | | | | | | control for ubitODE. for all let physics know about linking of physical parts. Assume UNTESTED | ||||
| | * | | | | | 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. ↵ | UbitUmarov | 2012-02-29 | 2 | -503/+148 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They will not colide if non-physical and Will collide with land if physical. assume UNTESTED | ||||
| * | | | | | | | | | | | 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 ↵ | Justin Clark-Casey (justincc) | 2012-03-06 | 1 | -61/+56 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | variable rather than making each test fetch it seperately. Also rename instance variables in the test to conform to naming standards and for understandability | ||||
| * | | | | | | | | | | | Merge branch 'master' into careminster | Melanie | 2012-03-06 | 2 | -12/+57 |
| |\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs | ||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |