ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-06-23 14:25:42 +08:00
Code Issues Packages Projects Releases Wiki Activity
14,081 Commits 5 Branches 106 Tags
ebeef02fef1a04b5b4cfe13dad588bcce7f9ba21
Commit Graph

519 Commits

Author SHA1 Message Date
Melanie
8f008f394d Flash out the prim count module 2011-01-29 04:27:20 +00:00
Melanie
e7d5ff9bd2 Create the structure of classes and interfaces to replace the cruft that 
is in the land management module today
 2011-01-29 02:24:27 +00:00
Melanie
0936455725 Adding the prim count module skeleton 2011-01-28 23:44:17 +00:00
Justin Clark-Casey (justincc)
ab1ec3c3cc minor: remove a few mono compiler warnings 2011-01-28 21:51:25 +00:00
Kevin Cozens
a0380af18f Display supported file extensions/formats in "terrain load help" (Mantis #5349) 2011-01-28 21:24:05 +00:00
Kevin Cozens
9798b044fe Added loading and saving of terrain files using Terragen format (Mantis #1564) 
Terrain files can now be loaded and saved using the Terragen (.ter) format.
Selection of the terrain file loader to use is now based on the extension
of the filename being loaded and the data is loaded using a memory stream
instead of writing it to a file and then loading it from the file.
 2011-01-28 21:19:53 +00:00
Melanie
80bf95b7b4 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2011-01-28 02:34:45 +00:00
Melanie
5a0cb7d37e Thank you, Goetz, for a patch to fix prim count display in cut regions. 2011-01-28 02:34:07 +00:00
Justin Clark-Casey (justincc)
f9ea5e69c5 Refactor: Break out LoadObjects() and LoadParcels() from a longer method 2011-01-27 21:07:21 +00:00
Justin Clark-Casey (justincc)
19e4473a97 Put confirmation on "land clear" command to avoid nasty accidents 2011-01-27 20:57:59 +00:00
Justin Clark-Casey (justincc)
be3685b1a2 When an oar is loaded, do not create a default parcel before loading the parcels from the OAR. 
The region spanning parcel shouldn't exist in this situation.  If it does, when the land data is loaded it is repersisted with a local ID which comes after the ones loaded via the oar, which obliterates the oar loaded one.

Resaving the data we just loaded from the database is somewhat odd in itself (though this makes sense from the way that OAR loading was already using the same event).
 2011-01-27 20:36:50 +00:00
Justin Clark-Casey (justincc)
42c0dbf49a Show local IDs in "land show" output. 
Also properly insert region name in "land clear" command
 2011-01-27 20:11:30 +00:00
Justin Clark-Casey (justincc)
ab9a0f2f1d Add "land clear" command 
This clears all parcels from the currently selected region and replaces them with the single region spanning default parcel owned by the estate owner
 2011-01-27 19:37:20 +00:00
Justin Clark-Casey (justincc)
5a26dc2743 Fix OAR parcel loading so that old parcels are replaced by the new instead of merged. 
The --merge switch will still merge the old and new land parcelling.
 2011-01-27 18:48:48 +00:00
Justin Clark-Casey (justincc)
e33cb3db93 remove unused CreateBaseLand() 2011-01-27 16:50:41 +00:00
Justin Clark-Casey (justincc)
a0469daf75 Implement command "land show". This shows all the parcels on the currently selected region/s 
This is useful for diagnostics.  The command is "land show" rather than "show land" because it's implemented as a module specific subcommand.
 2011-01-26 21:12:41 +00:00
Diva Canto
cc39d0bf4e Fixes mantis #5343 2011-01-23 14:47:58 -08:00
Justin Clark-Casey (justincc)
a32381cb9b stop extremely old region serialization commands from appearing in the console 
as far as I know these are unused and unsupported.  Please re-enable if this is not the case.  This does not effect save-xml[2]/load-xml[2]
 2011-01-22 00:27:34 +00:00
Justin Clark-Casey (justincc)
41105948bd remove some mono compiler warnings 2011-01-21 23:19:52 +00:00
Diva Canto
5e35651efc Protect World Map module, RequestMapItemsAsync, from badly formed URLs. 2011-01-17 11:45:13 -08:00
Melanie
914e4b319e Fix direct item give permissions 2011-01-12 21:39:13 +00:00
Diva Canto
0fabe0e5a5 Added more debug messages under the -verbose option. 2011-01-08 16:33:33 -08:00
Diva Canto
8c0e156b4d Make HG map search consistent with new syntax for link-region, i.e. http://foo.org. Old syntax (foo.org) is still supported, but has surprising results when ppl search again, because internally the HG link names start with http. 2011-01-07 11:38:54 -08:00
Diva Canto
81587466e7 Map search: changed the flag sent to the client. It was 2 (???), now it's 0. This makes HG map tiles work on map search -- a longstanding annoyance. My map search tests were all ok, but since I don't understand these flag values, this may break something related to map search. 2011-01-06 12:53:54 -08:00
Melanie
c48ddbfef1 Fix scoping for prim region crossings 2011-01-03 19:41:02 +00:00
Melanie
9971766256 Implement Scope ID lookup on GetLandData. Stacked regions were not handled 
properly
 2011-01-03 19:40:55 +00:00
Diva Canto
06077f775f Fixes mantis #5279 2010-12-25 08:28:42 -08: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
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
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
Jonathan Freedman
45cd2e3ef9 Merge branch 'master-core' into mantis5110 2010-12-05 11:49:15 -08: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
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
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
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
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
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