aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-03-091-4/+5
|\
| * Merge branch 'ubitwork'Melanie2012-03-094-112/+194
| |\
| * | Fix a merge artefactMelanie2012-03-091-4/+5
* | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-03-09133-1036/+2549
|\ \ \ | |/ / | | / | |/ |/|
| * Merge branch 'master' into careminsterMelanie2012-03-095-93/+60
| |\
| | * Simplify minimap coarse location code by just reference SP.AbsolutePositionJustin Clark-Casey (justincc)2012-03-092-12/+3
| | * Get rid of unnecessary ParentID == 0 check on SP.Get_AbsolutePosition since t...Justin Clark-Casey (justincc)2012-03-091-2/+2
| | * Use SP.ParentPart instead of ParentID in places where it's more efficient (sa...Justin Clark-Casey (justincc)2012-03-094-68/+32
| | * refactor: cleanup SP.HandleAgentSit so that everything is done within one if ...Justin Clark-Casey (justincc)2012-03-091-15/+8
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-03-087-49/+798
| | |\
| | | * Remove a race condition from SP.Set_AbsolutePosition where we assume the Pare...Justin Clark-Casey (justincc)2012-03-091-5/+5
| | * | HG inventory/asset transfers: serialize asset posts. I'm using the same patte...Diva Canto2012-03-081-1/+20
| * | | Merge branch 'master' into careminsterMelanie2012-03-090-0/+0
| |\ \ \ | | | |/ | | |/|
| | * | FireAndForget scripted rez - port from AvinationMelanie2012-03-091-41/+46
| * | | 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
| |\ \ \ \ \ \
| * \ \ \ \ \ \ 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
generated by cgit v1.1 at 2024-12-20 22:09:26 +0000