Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster | Melanie | 2010-02-08 | 4 | -20/+23 |
|\ | |||||
| * | Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-02-08 | 2 | -18/+18 |
| |\ | |||||
| | * | endline fix 2 | Teravus Ovares (Dan Olivares) | 2010-02-06 | 1 | -6/+6 |
| | | | |||||
| | * | Endline fix | Teravus Ovares (Dan Olivares) | 2010-02-06 | 1 | -12/+12 |
| | | | |||||
| * | | minor: log what kind of wearable cannot be found | Justin Clark-Casey (justincc) | 2010-02-05 | 1 | -2/+4 |
| |/ | |||||
| * | Revert "Old OpenSim installations may have no AssetCaching setting in ↵ | Justin Clark-Casey (justincc) | 2010-02-05 | 1 | -3/+1 |
| | | | | | | | | | | | | | | | | config-include/StandaloneCommon.ini [Modules] (or no [Modules] at all)" This will be replaced by a better solution where an enabled baking module will fail if no cache is in place (same for dynamic texture modules) This reverts commit 7058a4c2597a2b76704e906b73ae7077ff805b16. | ||||
| * | Old OpenSim installations may have no AssetCaching setting in ↵ | Justin Clark-Casey (justincc) | 2010-02-05 | 1 | -1/+3 |
| | | | | | | | | | | | | | | config-include/StandaloneCommon.ini [Modules] (or no [Modules] at all) If this is the case, this patch makes CenomeAssetCache the default cache (which matches that selected in StandaloneCommon.ini.example) Not having an asset cache may lead to a continual loop of appearance baking failures and cause dynamic textures not to work, among other effects | ||||
| * | minor: one method doc | Justin Clark-Casey (justincc) | 2010-02-04 | 1 | -0/+1 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2010-02-04 | 3 | -36/+22 |
|\ \ | |/ | |||||
| * | minor: remove one mono compiler warning | Justin Clark-Casey (justincc) | 2010-02-03 | 1 | -3/+1 |
| | | |||||
| * | minor: remove one mono compiler warning | Justin Clark-Casey (justincc) | 2010-02-03 | 1 | -10/+8 |
| | | |||||
| * | refactor: move world comm message queueing into its own method | Justin Clark-Casey (justincc) | 2010-02-02 | 1 | -23/+13 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2010-02-02 | 2 | -128/+85 |
|\ \ | |/ | |||||
| * | Apply http://opensimulator.org/mantis/view.php?id=4548 | Justin Clark-Casey (justincc) | 2010-01-29 | 1 | -1/+1 |
| | | | | | | | | | | Fix command params check on fcache expire <datetime> Thanks coyled | ||||
| * | use common sop2 setup for TestMergeOarV0_2() | Justin Clark-Casey (justincc) | 2010-01-29 | 1 | -16/+12 |
| | | |||||
| * | make TestSaveOarV0_2() use a common part2 construction | Justin Clark-Casey (justincc) | 2010-01-29 | 1 | -18/+14 |
| | | |||||
| * | use common part1 createio nin TestMergeOarV0_2() | Justin Clark-Casey (justincc) | 2010-01-29 | 1 | -16/+5 |
| | | |||||
| * | minor: swap which part uses the automatically set up scene in TestMergeOarV0_2() | Justin Clark-Casey (justincc) | 2010-01-29 | 1 | -25/+13 |
| | | |||||
| * | use common part1 creation in ArchiverTests.TestLoadOarV0_2() | Justin Clark-Casey (justincc) | 2010-01-29 | 1 | -30/+28 |
| | | |||||
| * | refactor out scene object 1 creation n ArchiverTetss | Justin Clark-Casey (justincc) | 2010-01-29 | 1 | -44/+22 |
| | | |||||
| * | factor out scene setup in ArchiverTests | Justin Clark-Casey (justincc) | 2010-01-29 | 1 | -40/+53 |
| | | |||||
| * | Add method to get all items with the same name from a particular prim | Justin Clark-Casey (justincc) | 2010-01-29 | 1 | -5/+4 |
| | | | | | | | | Extend load oar test to check loading of a sound item | ||||
| * | Resolve one more conflict I overlooked | Melanie | 2010-01-29 | 1 | -14/+0 |
| | | |||||
| * | Revert "Updates all IRegionModules to the new style region modules." | Melanie | 2010-01-29 | 54 | -1466/+698 |
| | | | | | | | | This reverts commit ec3c31e61e5e540f822891110df9bc978655bbaf. | ||||
* | | Resolve one more conflict I overlooked | Melanie | 2010-01-29 | 1 | -14/+0 |
| | | |||||
* | | Revert "Updates all IRegionModules to the new style region modules." | Melanie | 2010-01-29 | 54 | -1466/+698 |
| | | | | | | | | This reverts commit ec3c31e61e5e540f822891110df9bc978655bbaf. | ||||
* | | Merge branch 'master' into careminster | Melanie | 2010-01-28 | 1 | -4/+7 |
|\ \ | |/ | |||||
| * | Fixes inconsistencies in the permissions module. Adds a region_manager_is_god | Melanie | 2010-01-28 | 1 | -4/+7 |
| | | | | | | | | | | | | configurable. Previously, estate managers could enter god mode, but would not have any powers. Now estate managers can enter god mode only if this option is true, and then will have real god powers. | ||||
* | | Merge branch 'master' into careminster | Melanie | 2010-01-28 | 1 | -1/+5 |
|\ \ | |/ | |||||
| * | Changes WorldCommModule to ISharedRegionModule. | Revolution | 2010-01-28 | 1 | -1/+5 |
| | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com> | ||||
* | | Some merge fixups | Melanie | 2010-01-26 | 1 | -4/+5 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2010-01-26 | 57 | -701/+1629 |
|\ \ | |/ | |||||
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-01-23 | 3 | -3/+151 |
| |\ | |||||
| | * | Add first part of test for checking restore of task inventory items on oar load | Justin Clark-Casey (justincc) | 2010-01-22 | 2 | -1/+49 |
| | | | | | | | | | | | | Passes but not yet complete | ||||
| | * | complete assertion checks of all other oar loaded region settings | Justin Clark-Casey (justincc) | 2010-01-22 | 1 | -0/+28 |
| | | | |||||
| | * | Allow oar loading to work even if an estate module is not present | Justin Clark-Casey (justincc) | 2010-01-22 | 2 | -2/+74 |
| | | | | | | | | | | | | Write bare bones unit test for region setting loads | ||||
| * | | Updates all IRegionModules to the new style region modules. | Revolution | 2010-01-23 | 54 | -711/+1492 |
| |/ | | | | | | | Signed-off-by: Melanie <melanie@t-data.com> | ||||
* | | Adds example to OpenSim.ini.example for Admin Default Parcel settings | Careminster Staff | 2010-01-19 | 1 | -2/+8 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2010-01-18 | 1 | -2/+9 |
|\ \ | |/ | |||||
| * | Fix a major security problem with osSetDynamicTexture which allowed the ↵ | CasperW | 2010-01-18 | 1 | -5/+12 |
| | | | | | | | | deletion of /any/ asset. | ||||
| * | Let monitor data be requested using either the short form of the name or the | Melanie | 2010-01-16 | 1 | -1/+4 |
| | | | | | | | | full, namespace qualified version. | ||||
| * | Shorten the names of the tags in monitorstats summary to the immediate type | Melanie | 2010-01-16 | 1 | -1/+5 |
| | | | | | | | | | | name sans namespace. Needs adjustment of scripts using these!. Request my name still uses full namespace path. | ||||
* | | Fix a major security problem with osSetDynamicTexture which allowed the ↵ | CasperW | 2010-01-18 | 1 | -5/+12 |
| | | | | | | | | deletion of /any/ asset. | ||||
* | | Add chat banning. Staff patch | Melanie | 2010-01-18 | 1 | -2/+49 |
| | | |||||
* | | Fix a typo | Melanie | 2010-01-18 | 1 | -4/+4 |
| | | |||||
* | | Adds land ejection and freezing. Adds more checks to land banning. | Careminster Staff | 2010-01-18 | 1 | -23/+419 |
| | | |||||
* | | Adds Land Banning. | Careminster Staff | 2010-01-14 | 2 | -58/+120 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2010-01-14 | 3 | -8/+10 |
|\ \ | |/ | |||||
| * | Change the error messages on region region registration. This changes URM | Melanie | 2010-01-13 | 3 | -8/+10 |
| | | | | | | | | | | and region. The non-error case should be compatible, so no version bump. Untested. | ||||
* | | Merge branch 'master' into careminster | Melanie | 2010-01-10 | 4 | -17/+159 |
|\ \ | |/ |