aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | remove unnecessary hash local variableJustin Clark-Casey (justincc)2012-03-051-2/+0
| | | | |
| | * | | Make asset compression optional. Currently set to false and not ↵Justin Clark-Casey (justincc)2012-03-031-16/+24
| | | | | | | | | | | | | | | | | | | | configurable from outside MySQLXAssetData.
| | * | | Implement basic gzip compression for xassetdataJustin Clark-Casey (justincc)2012-03-031-10/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whether this is worthwhile is debatable since here we are not transmitting data over a network In addition, jpeg2000 (the biggest data hog) is already a compressed image format. May not remain.
| | * | | If asset data already exists with the required hash then don't rewrite itJustin Clark-Casey (justincc)2012-03-031-17/+59
| | | | |
| | * | | Perform asset storage transactionallyJustin Clark-Casey (justincc)2012-03-021-57/+69
| | | | |
| | * | | Merge branch 'master' into xassetserviceJustin Clark-Casey (justincc)2012-03-024-40/+34
| | |\ \ \
| | * | | | Make xassetservice execute one query to retrieve the asset, not twoJustin Clark-Casey (justincc)2012-03-021-28/+4
| | | | | |
| | * | | | Merge branch 'master' into xassetserviceJustin Clark-Casey (justincc)2012-03-022-110/+55
| | |\ \ \ \
| | * | | | | Make XAssetService a de-duplicating asset service.Justin Clark-Casey (justincc)2012-03-022-0/+443
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is an extremely crude implemenation which almost works by accident. Nevertheless it does work. It can be tested with the instructions at http://opensimulator.org/wiki/Feature_Proposals/Deduplicating_Asset_Service#Testing It does not interact at all with the existing asset service or any data stored there. This code is subject to change without notice and should not be used for anything other than gawking.
| | * | | | | Start by adding XAssetService as a copy of the existing AssetService.Justin Clark-Casey (justincc)2012-03-022-2/+218
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 careminsterMelanie2012-03-080-0/+0
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Hold a ref to the prim we're sat on rather than querying scene each timeMelanie2012-03-081-27/+29
| |/ / / / / | | | | | | | | | | | | | | | | | | the check for significant is carried out. Prevents a deadlock condition.
* | | | | | Merge branch 'master' into careminsterMelanie2012-03-0835-233/+326
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Move "change region" command into general categoryJustin Clark-Casey (justincc)2012-03-081-1/+1
| | | | | |
| * | | | | Uses shorter AddCommand form for "show estates"Justin Clark-Casey (justincc)2012-03-081-1/+1
| | | | | |
| * | | | | Display help commander topics in capitalized form - the commands themselves ↵Justin Clark-Casey (justincc)2012-03-083-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/opensimJustin Clark-Casey (justincc)2012-03-081-4/+1
| |\ \ \ \ \
| * | | | | | Change "help" to display categories/module list then "help ↵Justin Clark-Casey (justincc)2012-03-0835-192/+316
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | <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 ↵Melanie2012-03-084-180/+96
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | careminster
| * | | | | | Hold a ref to the prim we're sat on rather than querying scene each timeMelanie2012-03-081-27/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | the check for significant is carried out. Prevents a deadlock condition.
| * | | | | | changes on undo/redo (untested/incomplete). Think we may consider moving ↵UbitUmarov2012-03-073-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 careminsterMelanie2012-03-075-22/+25
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * | | | | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-03-074-20/+25
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | minor: make NPC tests run in a given order, comment out log lines in mock ↵Justin Clark-Casey (justincc)2012-03-074-20/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | region data plugins, null out scene in script and npc torture tests, add other doc comments to torture tests
| * | | | | | Always zero the PhysActor on dupes to prevent side effects on the orignal primMelanie2012-03-071-4/+1
| |/ / / / /
* | | | | | Fix merge issueMelanie2012-03-071-76/+79
| | | | | |
* | | | | | Merge branch 'master' into careminsterMelanie2012-03-0724-107/+453
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * | | | | Stop individually deleting objects at the end of each ObjectTortureTest.Justin Clark-Casey (justincc)2012-03-075-35/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-071-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-061-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-068-12/+136
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | status" command. This is for diagnostic purposes.
| * | | | | Remove unnecessary explicit ElapsedEventHandler in SimReporterJustin Clark-Casey (justincc)2012-03-061-1/+1
| | | | | |
| * | | | | Explictly close down the StatsReporter so that we can shutdown its timerJustin Clark-Casey (justincc)2012-03-062-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-061-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-068-26/+228
| | | | | | | | | | | | | | | | | | | | | | | | they're running
* | | | | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2012-03-0710-803/+871
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | careminster
| * | | | | Prevent scripted region crossings from crashing with prim limits enabledMelanie2012-03-061-1/+7
| | | | | |
| * | | | | Null PhysActor on SOP.Copy() to prevent clobbering the original oneMelanie2012-03-061-4/+3
| | | | | |
| * | | | | Removed some whitespace errors - don't be naughty, don't use hard tabs!Melanie2012-03-061-11/+0
| | | | | | | | | | | | | | | | | | | | | | | | Also removed commented code block.
| * | | | | make copied parts have diferent LocalIds than original. More building ↵UbitUmarov2012-03-062-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 ubitworkUbitUmarov2012-03-063-7/+27
| |\ \ \ \ \
| * | | | | | update ubitOdeUbitUmarov2012-03-054-78/+297
| | | | | | |
| * | | | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-03-052-3/+15
| |\ \ \ \ \ \
| * | | | | | | update UbitOdeUbitUmarov2012-03-045-65/+69
| | | | | | | |
| * | | | | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-03-041-0/+2
| |\ \ \ \ \ \ \
| * | | | | | | | update UbitODEUbitUmarov2012-03-043-36/+55
| | | | | | | | |
| * | | | | | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-03-031-5/+3
| |\ \ \ \ \ \ \ \
| * | | | | | | | | update ubitODEUbitUmarov2012-03-021-15/+45
| | | | | | | | | |
| * | | | | | | | | ubitODE bug fixUbitUmarov2012-02-291-1/+1
| | | | | | | | | |
| * | | | | | | | | update ubitODE to current working stateUbitUmarov2012-02-292-113/+199
| | | | | | | | | |
generated by cgit v1.1 at 2024-12-22 23:01:47 +0000