aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '0.6.9-post-fixes' into careminsterMelanie2010-03-0612-34/+167
|\
| * fix bug where region settings loaded via an oar (water height, terrain textur...Justin Clark-Casey (justincc)2010-02-261-0/+2
| * Formatting cleanup.Jeff Ames2010-02-221-4/+4
| * minor: remove mono compiler warningJustin Clark-Casey (justincc)2010-02-191-1/+1
| * forestall bug reports about the Command error: System.EntryPointNotFoundExcep...Justin Clark-Casey (justincc)2010-02-193-8/+86
| * minor: Make FlotsamAssetCache default loglevel 0 to match that given in bin/c...Justin Clark-Casey (justincc)2010-02-191-2/+2
| * minor: fix error inserting field in log messageJustin Clark-Casey (justincc)2010-02-171-1/+1
| * Formatting cleanup.Jeff Ames2010-02-154-15/+15
| * Revolution is on the roll again! :)Revolution2010-02-143-8/+61
* | Change a condition to actually make linden land reclaim workMelanie2010-02-161-1/+1
* | Merge branch 'master' into careminsterMelanie2010-02-148-275/+68
|\ \ | |/
| * Apply last two patches from http://opensimulator.org/mantis/view.php?id=3522Justin Clark-Casey (justincc)2010-02-122-3/+3
| * minor: remove completely commented out and unused classJustin Clark-Casey (justincc)2010-02-121-226/+0
| * Fix http://opensimulator.org/mantis/view.php?id=4224Justin Clark-Casey (justincc)2010-02-125-46/+65
* | Merge branch 'master' into careminsterMelanie2010-02-084-20/+23
|\ \ | |/
| * Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-02-082-18/+18
| |\
| | * endline fix 2Teravus Ovares (Dan Olivares)2010-02-061-6/+6
| | * Endline fixTeravus Ovares (Dan Olivares)2010-02-061-12/+12
| * | minor: log what kind of wearable cannot be foundJustin Clark-Casey (justincc)2010-02-051-2/+4
| |/
| * Revert "Old OpenSim installations may have no AssetCaching setting in config-...Justin Clark-Casey (justincc)2010-02-051-3/+1
| * Old OpenSim installations may have no AssetCaching setting in config-include/...Justin Clark-Casey (justincc)2010-02-051-1/+3
| * minor: one method docJustin Clark-Casey (justincc)2010-02-041-0/+1
* | Merge branch 'master' into careminsterMelanie2010-02-043-36/+22
|\ \ | |/
| * minor: remove one mono compiler warningJustin Clark-Casey (justincc)2010-02-031-3/+1
| * minor: remove one mono compiler warningJustin Clark-Casey (justincc)2010-02-031-10/+8
| * refactor: move world comm message queueing into its own methodJustin Clark-Casey (justincc)2010-02-021-23/+13
* | Merge branch 'master' into careminsterMelanie2010-02-022-128/+85
|\ \ | |/
| * Apply http://opensimulator.org/mantis/view.php?id=4548Justin Clark-Casey (justincc)2010-01-291-1/+1
| * use common sop2 setup for TestMergeOarV0_2()Justin Clark-Casey (justincc)2010-01-291-16/+12
| * make TestSaveOarV0_2() use a common part2 constructionJustin Clark-Casey (justincc)2010-01-291-18/+14
| * use common part1 createio nin TestMergeOarV0_2()Justin Clark-Casey (justincc)2010-01-291-16/+5
| * minor: swap which part uses the automatically set up scene in TestMergeOarV0_2()Justin Clark-Casey (justincc)2010-01-291-25/+13
| * use common part1 creation in ArchiverTests.TestLoadOarV0_2()Justin Clark-Casey (justincc)2010-01-291-30/+28
| * refactor out scene object 1 creation n ArchiverTetssJustin Clark-Casey (justincc)2010-01-291-44/+22
| * factor out scene setup in ArchiverTestsJustin Clark-Casey (justincc)2010-01-291-40/+53
| * Add method to get all items with the same name from a particular primJustin Clark-Casey (justincc)2010-01-291-5/+4
| * Resolve one more conflict I overlookedMelanie2010-01-291-14/+0
| * Revert "Updates all IRegionModules to the new style region modules."Melanie2010-01-2954-1466/+698
* | Resolve one more conflict I overlookedMelanie2010-01-291-14/+0
* | Revert "Updates all IRegionModules to the new style region modules."Melanie2010-01-2954-1466/+698
* | Merge branch 'master' into careminsterMelanie2010-01-281-4/+7
|\ \ | |/
| * Fixes inconsistencies in the permissions module. Adds a region_manager_is_godMelanie2010-01-281-4/+7
* | Merge branch 'master' into careminsterMelanie2010-01-281-1/+5
|\ \ | |/
| * Changes WorldCommModule to ISharedRegionModule.Revolution2010-01-281-1/+5
* | Some merge fixupsMelanie2010-01-261-4/+5
* | Merge branch 'master' into careminsterMelanie2010-01-2657-701/+1629
|\ \ | |/
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-01-233-3/+151
| |\
| | * Add first part of test for checking restore of task inventory items on oar loadJustin Clark-Casey (justincc)2010-01-222-1/+49
| | * complete assertion checks of all other oar loaded region settingsJustin Clark-Casey (justincc)2010-01-221-0/+28
| | * Allow oar loading to work even if an estate module is not presentJustin Clark-Casey (justincc)2010-01-222-2/+74