aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-03-118-146/+183
|\
| * Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2012-03-118-146/+183
| |\
| | * Merge branch 'master' into careminsterMelanie2012-03-118-146/+183
| | |\
| | | * 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-093-61/+4
| * | | Merge branch 'ubitwork'Melanie2012-03-119-234/+702
| |\ \ \ | | |/ / | |/| |
* | | | cleanup + commentsUbitUmarov2012-03-111-277/+0
* | | | cleanup + commentsUbitUmarov2012-03-111-167/+52
* | | | coments change..UbitUmarov2012-03-111-3/+3
* | | | minor changes on updates control on doChangeObject(..)UbitUmarov2012-03-111-10/+48
* | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-03-114-4/+114
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | Merge branch 'master' into careminsterMelanie2012-03-094-4/+114
| |\ \ | | |/
| | * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-03-093-3/+78
| | |\
| | | * More on inventory transfer hold ups:Diva Canto2012-03-092-2/+77
| | | * 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
| | | |/ | | |/|
* | | | Changed undo redo internals. moved exec code to UndoState.cs from sop that n...UbitUmarov2012-03-112-136/+195
* | | | BIG MESS. changed Iclient interface so only one event is used to inform scene...UbitUmarov2012-03-108-139/+539
* | | | ubitOde bugUbitUmarov2012-03-091-2/+4
* | | | on linking update linked parts physical flags acording to new parent ones ( ...UbitUmarov2012-03-091-1/+8
|/ / /
* | | let chode and ubitode find ode.dll on windowsUbitUmarov2012-03-092-0/+7
* | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-03-0968-809/+1241
|\ \ \
| * \ \ Merge branch 'master' into careminsterMelanie2012-03-094-92/+40
| |\ \ \ | | |/ /
| | * | 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
| | |/
| | * 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
| * | Merge branch 'master' into careminsterMelanie2012-03-091-2/+5
| |\ \ | | |/
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-03-091-27/+29
| | |\
| | | * 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-091-2/+5
| | |\ \ | | | |/ | | |/|
| | | * Merge branch 'master' into xassetserviceJustin Clark-Casey (justincc)2012-03-024-40/+34
| | | |\
| | | * \ Merge branch 'master' into xassetserviceJustin Clark-Casey (justincc)2012-03-022-110/+55
| | | |\ \
| | | * | | Start by adding XAssetService as a copy of the existing AssetService.Justin Clark-Casey (justincc)2012-03-021-2/+5
| * | | | | Merge branch 'master' into careminsterMelanie2012-03-0826-184/+206
| |\ \ \ \ \ | | |/ / / /
| | * | | | 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-0826-143/+196
| * | | | | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ...Melanie2012-03-084-180/+96
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-03-071-2/+0
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |