aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-03-096-5/+750
|\
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-03-092-29/+32
| |\
| | * Fixes mantis #5923Diva Canto2012-03-081-2/+3
| * | Merge branch 'xassetservice'Justin Clark-Casey (justincc)2012-03-095-3/+747
| |\ \
| | * | minor: move some compression related var setup inside compression if/then switchJustin Clark-Casey (justincc)2012-03-091-4/+3
| | * | Put big fat EXPERIMENTAL warning in xassetservice database pluginJustin Clark-Casey (justincc)2012-03-091-0/+10
| | * | Switch to sha256 from sha1 in order to avoid future asset hash collisions.Justin Clark-Casey (justincc)2012-03-063-10/+19
| | * | remove unnecessary hash local variableJustin Clark-Casey (justincc)2012-03-051-2/+0
| | * | Make asset compression optional. Currently set to false and not configurable...Justin Clark-Casey (justincc)2012-03-031-16/+24
| | * | Implement basic gzip compression for xassetdataJustin Clark-Casey (justincc)2012-03-031-10/+41
| | * | 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
| | * | | | Start by adding XAssetService as a copy of the existing AssetService.Justin Clark-Casey (justincc)2012-03-022-2/+218
* | | | | | 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
| |/ / / /
* | | | | 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 a...Justin Clark-Casey (justincc)2012-03-083-45/+14
| * | | | 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 <category/module>"...Justin Clark-Casey (justincc)2012-03-0835-192/+316
* | | | | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ...Melanie2012-03-084-180/+96
|\ \ \ \ \ \
| * | | | | | Hold a ref to the prim we're sat on rather than querying scene each timeMelanie2012-03-081-27/+30
| * | | | | | changes on undo/redo (untested/incomplete). Think we may consider moving thi...UbitUmarov2012-03-073-153/+66
* | | | | | | Merge branch 'master' into careminsterMelanie2012-03-075-22/+25
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | 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 reg...Justin Clark-Casey (justincc)2012-03-074-20/+25
| * | | | | | 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
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Stop individually deleting objects at the end of each ObjectTortureTest.Justin Clark-Casey (justincc)2012-03-075-35/+36
| * | | | | Add documentation to make more explicit the difference between OnRezScript an...Justin Clark-Casey (justincc)2012-03-071-5/+20
| * | | | | Remove static m_MainInstance in LocalGridServiceConnector.Justin Clark-Casey (justincc)2012-03-061-24/+10
| * | | | | Add sensor, dataserver requests, timer and listener counts to "xengine status...Justin Clark-Casey (justincc)2012-03-068-12/+136
| * | | | | 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
| * | | | | Fix TestSyntaxError() and TestSyntaxErrorDeclaringVariableInForLoop()Justin Clark-Casey (justincc)2012-03-061-8/+14
| * | | | | Get all test methods in OpenSim.Region.ScriptEngine.Tests.dll to report that ...Justin Clark-Casey (justincc)2012-03-068-26/+228
* | | | | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ...Melanie2012-03-0710-803/+871
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | 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
| * | | | | make copied parts have diferent LocalIds than original. More building control...UbitUmarov2012-03-062-5/+74
| * | | | | 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
| |\ \ \ \ \ \
generated by cgit v1.1 at 2024-12-28 20:56:12 +0000