Melanie
776d62b9c6
Merge branch 'master' into careminster
2010-02-04 17:29:33 +00:00
Justin Clark-Casey (justincc)
bde7f361fa
minor: remove one mono compiler warning
2010-02-03 19:46:33 +00:00
Justin Clark-Casey (justincc)
7c69badd3d
minor: remove one mono compiler warning
2010-02-03 19:34:08 +00:00
Justin Clark-Casey (justincc)
bbd41de6d5
refactor: move world comm message queueing into its own method
2010-02-02 20:38:58 +00:00
Melanie
d5ed92cf38
Merge branch 'master' into careminster
2010-02-02 03:56:29 +00:00
Justin Clark-Casey (justincc)
7b53067d6d
Apply http://opensimulator.org/mantis/view.php?id=4548
...
Fix command params check on fcache expire <datetime>
Thanks coyled
2010-01-29 21:52:13 +00:00
Justin Clark-Casey (justincc)
0cf88b34c9
use common sop2 setup for TestMergeOarV0_2()
2010-01-29 21:45:07 +00:00
Justin Clark-Casey (justincc)
68c7218fa1
make TestSaveOarV0_2() use a common part2 construction
2010-01-29 21:42:27 +00:00
Justin Clark-Casey (justincc)
0c3043a298
use common part1 createio nin TestMergeOarV0_2()
2010-01-29 21:37:25 +00:00
Justin Clark-Casey (justincc)
055d991cc1
minor: swap which part uses the automatically set up scene in TestMergeOarV0_2()
2010-01-29 21:33:11 +00:00
Justin Clark-Casey (justincc)
75dcd721de
use common part1 creation in ArchiverTests.TestLoadOarV0_2()
2010-01-29 21:27:14 +00:00
Justin Clark-Casey (justincc)
115e66218e
refactor out scene object 1 creation n ArchiverTetss
2010-01-29 21:10:14 +00:00
Justin Clark-Casey (justincc)
c1da07e4eb
factor out scene setup in ArchiverTests
2010-01-29 20:59:56 +00:00
Justin Clark-Casey (justincc)
ae2174d8f5
Add method to get all items with the same name from a particular prim
...
Extend load oar test to check loading of a sound item
2010-01-29 18:11:53 +00:00
Melanie
44c86cedcf
Resolve one more conflict I overlooked
2010-01-29 07:47:50 +00:00
Melanie
536a6bac72
Resolve one more conflict I overlooked
2010-01-29 07:42:45 +00:00
Melanie
a87a247f05
Revert "Updates all IRegionModules to the new style region modules."
...
This reverts commit ec3c31e61e .
2010-01-29 07:21:06 +00:00
Melanie
cfca9e1e81
Revert "Updates all IRegionModules to the new style region modules."
...
This reverts commit ec3c31e61e .
2010-01-29 07:20:13 +00:00
Melanie
5b9ca6e35f
Merge branch 'master' into careminster
2010-01-28 14:38:46 +00:00
Melanie
ee12b00cfa
Fixes inconsistencies in the permissions module. Adds a region_manager_is_god
...
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.
2010-01-28 14:34:31 +00:00
Melanie
2d9b69c186
Merge branch 'master' into careminster
2010-01-28 02:07:18 +00:00
Revolution
c26f1d1bfa
Changes WorldCommModule to ISharedRegionModule.
...
Signed-off-by: Melanie <melanie@t-data.com >
2010-01-28 02:05:05 +00:00
Melanie
e9c9a74e0a
Some merge fixups
2010-01-26 15:12:41 +00:00
Melanie
b80ea00265
Merge branch 'master' into careminster
2010-01-26 14:53:14 +00:00
Melanie
1254a5e50c
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-01-23 15:19:05 +00:00
Revolution
ec3c31e61e
Updates all IRegionModules to the new style region modules.
...
Signed-off-by: Melanie <melanie@t-data.com >
2010-01-23 15:18:52 +00:00
Justin Clark-Casey (justincc)
1df69be9a6
Add first part of test for checking restore of task inventory items on oar load
...
Passes but not yet complete
2010-01-22 20:32:34 +00:00
Justin Clark-Casey (justincc)
a0e4665077
complete assertion checks of all other oar loaded region settings
2010-01-22 17:17:25 +00:00
Justin Clark-Casey (justincc)
5f5fdc3624
Allow oar loading to work even if an estate module is not present
...
Write bare bones unit test for region setting loads
2010-01-22 16:22:23 +00:00
Careminster Staff
24056dc98b
Adds example to OpenSim.ini.example for Admin Default Parcel settings
2010-01-19 01:46:50 +00:00
Melanie
e3dbd79543
Merge branch 'master' into careminster
2010-01-18 17:24:21 +00:00
CasperW
d9c48e70a9
Fix a major security problem with osSetDynamicTexture which allowed the deletion of /any/ asset.
2010-01-18 17:56:27 +01:00
CasperW
3ff28e7a8f
Fix a major security problem with osSetDynamicTexture which allowed the deletion of /any/ asset.
2010-01-18 16:52:06 +00:00
Melanie
51bb311565
Add chat banning. Staff patch
2010-01-18 02:53:31 +00:00
Melanie
f4e30664e6
Fix a typo
2010-01-18 01:55:54 +00:00
Careminster Staff
44d523518a
Adds land ejection and freezing. Adds more checks to land banning.
2010-01-18 01:27:01 +00:00
Melanie
74b3ce8572
Let monitor data be requested using either the short form of the name or the
...
full, namespace qualified version.
2010-01-16 04:57:49 +00:00
Melanie
c9276f2051
Shorten the names of the tags in monitorstats summary to the immediate type
...
name sans namespace. Needs adjustment of scripts using these!.
Request my name still uses full namespace path.
2010-01-16 04:38:24 +00:00
Careminster Staff
a87d7a1296
Adds Land Banning.
2010-01-14 04:11:17 +00:00
Melanie
f0152790cf
Merge branch 'master' into careminster
2010-01-14 01:20:07 +00:00
Melanie
e3a04fcb7b
Change the error messages on region region registration. This changes URM
...
and region. The non-error case should be compatible, so no version bump.
Untested.
2010-01-13 03:08:34 +00:00
Melanie
1676e70dfe
Merge branch 'master' into careminster
2010-01-10 04:16:06 +00:00
Melanie
b9e6f4583c
Implement access module commands
2010-01-10 03:48:10 +00:00
Melanie
b0a7bcb2c8
Add "StartDisabled" to [Startup] to make all regions start up with
...
logins disabled until enabled from the console. Add the AccessModule (WIP)
2010-01-10 03:17:40 +00:00
Melanie
81d5a4b6d8
Remove "login disable", "login enable" and "login status" commands.
2010-01-10 03:03:18 +00:00
Melanie
089f5403a7
Merge branch 'master' into careminster
2010-01-09 16:35:32 +00:00
Melanie
bc558788c2
A last fix for estate access by group. One should send the correct list.
2010-01-09 16:32:14 +00:00
Melanie
a764eb5dc7
Merge branch 'master' into careminster
2010-01-09 14:21:50 +00:00
Melanie
063f106cbb
Add functionality to estate "Allowed Users" and "Allowed Groups". Allowed users
...
will be honored now, while allowed groups will not. This requires additional
groups module integration work
2010-01-09 14:17:44 +00:00
Melanie
d22bdb5095
Merge branch 'master' into careminster
2010-01-09 12:02:48 +00:00