aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-03-1110-147/+275
|\
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-03-109-111/+236
| |\
| | * Fix TestSaveOarNoAssets() by not launch a no-assets request on a separate thr...Justin Clark-Casey (justincc)2012-03-101-1/+1
| | * minor: In IAR save, log when we start adding the control file rather than say...Justin Clark-Casey (justincc)2012-03-101-2/+3
| | * minor: rearrange some save oar messages so they say what they're about to do ...Justin Clark-Casey (justincc)2012-03-101-8/+7
| | * On OAR saving, try fetch assets serially rather than firing all the requests ...Justin Clark-Casey (justincc)2012-03-102-9/+18
| | * Add ability to specify a default estate to be used when creating regions.Justin Clark-Casey (justincc)2012-03-101-64/+152
| | * Factor out common default animations code into SLUtil. LLClientView now make...Justin Clark-Casey (justincc)2012-03-094-62/+55
| * | Serialize all web requests to a particular host:port pair; only applied to th...Mic Bowman2012-03-091-0/+41
* | | Merge branch 'master' into careminsterMelanie2012-03-095-7/+121
|\ \ \ | | |/ | |/|
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-03-094-6/+85
| |\ \ | | |/
| | * More on inventory transfer hold ups:Diva Canto2012-03-093-5/+84
| | * More on HG inventory transfers. Move the FireAndForget higher up.Diva Canto2012-03-092-2/+2
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-03-084-88/+36
| | |\
| | * | More on the freeze on HG inventory transfers: spawn a threadlet on the funct...Diva Canto2012-03-081-1/+1
| * | | fix for NPC not playing internal animationssatguru srivastava2012-03-091-1/+36
| | |/ | |/|
* | | let chode and ubitode find ode.dll on windowsUbitUmarov2012-03-092-0/+7
* | | Merge branch 'ubitwork'Melanie2012-03-094-112/+194
|\ \ \
| * | | more changes on undo/redo group scaling seems to work betterUbitUmarov2012-03-092-14/+9
| * | | more changes in undo/redo. Basicly moved control to llclientview.cs. later w...UbitUmarov2012-03-093-100/+187
* | | | Fix a merge artefactMelanie2012-03-091-4/+5
* | | | 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-086-48/+796
| |\ \
| | * | Remove a race condition from SP.Set_AbsolutePosition where we assume the Pare...Justin Clark-Casey (justincc)2012-03-091-5/+5
| | * | FireAndForget scripted rez - port from AvinationMelanie2012-03-091-41/+46
| * | | 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-095-4/+748
|\ \ \ \ | | |/ / | |/| |
| * | | 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
| | * | Hold a ref to the prim we're sat on rather than querying scene each timeMelanie2012-03-081-27/+29
| * | | Merge branch 'xassetservice'Justin Clark-Casey (justincc)2012-03-094-2/+745
| |\ \ \ | | |/ / | |/| |
| | * | 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-062-9/+17
| | * | 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-0834-233/+325
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Move "change region" command into general categoryJustin Clark-Casey (justincc)2012-03-081-1/+1
generated by cgit v1.1 at 2024-12-18 07:03:23 +0000