Commit Graph

631 Commits

Author SHA1 Message Date
Melanie
354f568508 Merge branch 'master' into careminster-presence-refactor 2010-12-14 23:58:45 +00:00
Diva Canto
10ae5454cb Made the map thread request the map items asynchronously, as the name suggested -- but with a cap of 20 async requests max at any given time. 2010-12-14 12:16:51 -08:00
Diva Canto
55e04e6c68 Fixes mantis #5270 -- Map tiles for hyperlinks not showing in world map for grided sims. 2010-12-14 08:11:49 -08:00
Melanie
2a9f095071 Fix a small bug in ban list handling 2010-12-13 22:14:34 +00:00
Melanie
6528fc5c64 Fix a small bug in ban list handling 2010-12-13 22:27:03 +01:00
Melanie
9bd7f3b03a Revamp the viewer -> banlist packet processing so fix a number of bugs.
Remove the too coarse CanEditParcel method in favor of a CanEditParcelProperties
method that takes a GroupPowers argument to specify what action is to be
taken. Also, make the method to set parcel data much more granular. Permissions
in a deeded setting should now work.
2010-12-13 20:35:56 +00:00
Melanie
6b374fa547 Revamp the viewer -> banlist packet processing so fix a number of bugs.
Remove the too coarse CanEditParcel method in favor of a CanEditParcelProperties
method that takes a GroupPowers argument to specify what action is to be
taken. Also, make the method to set parcel data much more granular. Permissions
in a deeded setting should now work.
2010-12-13 20:19:52 +01:00
Melanie
d36b880022 Change some lookups in he Land Management module to make group permissions
work better. Add a generic group permissions hoot to the scene permissions
system.
2010-12-13 11:13:34 +01:00
Melanie
8aa63093b1 Merge branch 'master' into careminster-presence-refactor 2010-12-12 01:20:46 +00:00
Justin Clark-Casey (justincc)
373ef594ba Drop current OAR version back to 0.5 since these are currently now compatible with older OpenSim versions again.
Removed ability to choose 0.4 to avoid having to write code that polices this properly.  Please shout on the ml if you really need this.
2010-12-11 01:57:32 +00:00
Melanie
45314c6622 Merge branch 'master' into careminster-presence-refactor 2010-12-06 02:54:51 +00:00
Jonathan Freedman
45cd2e3ef9 Merge branch 'master-core' into mantis5110 2010-12-05 11:49:15 -08:00
Melanie
342dc532ec Merge branch 'master' into careminster-presence-refactor
Also prevent god takes from ending up in Lost and Found
2010-12-03 02:36:13 +00:00
Melanie
0218845c2e Prevent the restart module from barfing if it's not configured 2010-11-30 15:40:50 +01:00
Melanie
b08cc63003 Change inworld restart to use blue boxes rather than notices to match SL 2010-11-29 21:45:03 +01:00
Diva Canto
f86c438653 Preservation of creator information now also working in IARs. Cleaned up usage help. Moved Osp around, deleted unnecessary OspInventoryWrapperPlugin, added manipulation of SOP's xml representation in a generic ExternalRepresentationUtils function. 2010-11-29 08:43:33 -08:00
Melanie
cccfd1db34 Add marker files to the restart module so external scripts can be used to
kill a process that hasn't restarted properly
2010-11-26 03:21:51 +01:00
Melanie
33c023bf6a Allow group lookup during tp / login to make restricting parcels to group
work.
2010-11-25 21:22:22 +01:00
Melanie
2d2098f5da Export the module interface for restart 2010-11-25 04:06:25 +00:00
Melanie
57c4def254 Change all restarting to use the restart module. Remove hardcoded behavior 2010-11-25 03:16:52 +00:00
Melanie
c14592d4ba Export the module interface for restart 2010-11-25 04:16:34 +01:00
Melanie
6c3eb21440 Merge branch 'master' into careminster-presence-refactor 2010-11-25 03:27:35 +00:00
Melanie
fb97fe8307 Finish the RestartModule and fix some bugs. Add new console commands:
region restart bluebox <msg> <time> ...
region restart notice <msg> <time> ...
region restart abort [<message>]
2010-11-25 02:30:06 +00:00
Melanie
1522567920 Finish the RestartModule and fix some bugs. Add new console commands:
region restart bluebox <msg> <time> ...
region restart notice <msg> <time> ...
region restart abort [<message>]
2010-11-25 02:37:50 +01:00
Melanie
2c1c04119d Merge branch 'master' into careminster-presence-refactor 2010-11-25 01:24:32 +00:00
Melanie
6734c9f83a Implement the restart module 2010-11-25 01:22:05 +00:00
Melanie
e14f449cc2 Adding the skeleton for the restart module 2010-11-24 22:14:53 +00:00
Jonathan Freedman
bc51dfc45e Merge branch 'master-core' into mantis5110 2010-11-23 22:27:54 -08:00
Melanie
6557d5f359 Merge branch 'master' into careminster-presence-refactor 2010-11-23 14:05:09 +00:00
Marck
c68f03a6ff Fix: Allow use of parameters without specifying a file path with command "save oar" 2010-11-23 11:45:12 +01:00
Jonathan Freedman
b7f5e82843 Merge branch 'master-core' into mantis5110 2010-11-21 20:01:48 -08:00
Jonathan Freedman
562147475c Merge https://github.com/opensim/opensim into mantis5110
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
2010-11-21 19:51:23 -08:00
Diva Canto
c617d658dd Added creator info across the board -- TaskInventoryItems and InventoryItems themselves. Tested. Seems to be working, main tests pass. Nothing done for IARs or HG transfers yet -- this only works for OARs for the time being.
New migration in inventory table in order to make CreatorID varchar(255).
2010-11-21 17:19:24 -08:00
Melanie
22ff06ba17 Merge branch 'master' into careminster-presence-refactor 2010-11-22 01:09:26 +00:00
Melanie
8d7b181b58 Merge branch 'master' into careminster-presence-refactor 2010-11-21 23:47:28 +00:00
Diva Canto
6a9ae9e7cb Global creator information working on MySQL DB and on load/save OARs. Creator name properly shown on the viewer as first.last @authority.
New option added to save oar -profile=url. Migration on RegionStore making CreatorID be 255 chars.
Moved Handling of user UUID -> name requests to a new module UserManagement/UserManagementModule.
2010-11-21 13:16:52 -08:00
Justin Clark-Casey (justincc)
a88bcbb118 Knock V0_2 decals off archive tests since they're misleading 2010-11-20 03:01:47 +00:00
Justin Clark-Casey (justincc)
d7bca3d8e8 Fix unit tests and save problems
(note; contrary to previous commits, saving 0.4 OARs is actually broken since serialized objects in inventories are not yet converted properly).
Firstly, if you can save a version 1.0 OAR then you can load it too.
Secondly, closing the save stream even on success before assets/objects are saved is a bad idea
2010-11-20 02:59:21 +00:00
Justin Clark-Casey (justincc)
1087d6042b correct build break. for some reason, xbuild didn't rebuild test dlls 2010-11-20 02:43:38 +00:00
Justin Clark-Casey (justincc)
2c7be7130e Bump oar version to 1.0 from 0.5
If oar contents are being changed such that older versions of opensim can't load them, then the major version must be increased
This also locks version parameters to either 1.0 or 0.4, so that arbitrary 'versions' cannot be saved
Also closes save stream properly in the event of an error
Version 1.0 OARs are currently incompatible with OpenSim 0.7.0.2 and earlier.  However, you can still save compatible version 0.4 OARs by specifing --version=0 on the save oar command line
e.g. save oar --version=0 oars/test.oar
2010-11-20 02:32:12 +00:00
Melanie
43c270b536 Fix gesture and viewer preview sounds not playing 2010-11-17 18:20:24 +00:00
Melanie
2e5ae1b013 Fix gesture and viewer preview sounds not playing 2010-11-17 17:54:32 +01:00
Melanie
80d3998001 Recalculate prim counts when a parcel is deeded 2010-11-17 17:54:03 +01:00
Melanie
c4eb430ad2 Merge branch 'master' into careminster-presence-refactor 2010-11-16 21:15:15 +00:00
Melanie
ff3e466000 Remove a debug spam 2010-11-10 01:17:40 +00:00
Melanie
846198bb9e Although the Allow Voice setting is per estate rather than per region,
apparently it is required in the region handshake to let the client
enable parcel voice controls. So, send it.
2010-11-09 23:55:43 +00:00
Melanie
fa64f2e56e Although the Allow Voice setting is per estate rather than per region,
apparently it is required in the region handshake to let the client
enable parcel voice controls. So, send it.
2010-11-09 23:54:08 +00:00
Melanie
22144eb8f7 Fix parcel bans to work only on the avatars they're supposed to work on instead of pushing all avatars, even the ones that are allowed. 2010-11-09 22:15:59 +00:00
Melanie
dfe11566f4 Fix parcel bans to work only on the avatars they're supposed to work on instead of pushing all avatars, even the ones that are allowed. 2010-11-09 20:18:36 +01:00
Melanie
5a3cd9f1d0 Decrease min search length to 2 chars for map search. 2010-11-07 16:08:41 +01:00