ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-07-14 03:15:36 +08:00
Code Issues Packages Projects Releases Wiki Activity
14,285 Commits 5 Branches 86 Tags
18e206d2ed5cc1828f2ada27ff4698bdc0b84352
Commit Graph

159 Commits

Author SHA1 Message Date
Justin Clark-Casey (justincc)
9456bb77fb Upgrade nunit.framework.dll to version 2.5.9. Fix up tests appropriately. 
This version removes the NUnit.Framework.SyntaxHelpers namespace, so any modules with their own tests will need to delete this using statement.
 2011-03-09 23:25:24 +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)
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)
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
Diva Canto
0fabe0e5a5 Added more debug messages under the -verbose option. 2011-01-08 16:33:33 -08: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
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
Marck
c68f03a6ff Fix: Allow use of parameters without specifying a file path with command "save oar" 2010-11-23 11:45:12 +01: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
Diva Canto
9f5ab3b965 Old deserialization can't deal with commas in flag fields. Making use of -version option on save oar command. Bumped archives version to 0.5; version < 0.5 generates flag fields without commas. Everything else is identical. 2010-11-02 12:05:24 -07:00
Jeff Ames
a331fd4e24 Formatting cleanup. 2010-10-27 00:01:03 -04:00
Justin Clark-Casey (justincc)
7f2d844916 Implement guard against trying to load incompatible version IARs 2010-10-22 19:30:15 +01:00
Justin Clark-Casey (justincc)
199b61f1b2 start parsing iar control file 
This change requires a prebuild[.sh|.bat] since a System.Xml.Linq reference is added to prebuild.xml
 2010-10-22 19:24:42 +01:00
Justin Clark-Casey (justincc)
a5bb7b8a30 slightly simplify oar control file loading code 2010-10-22 18:47:38 +01:00
Justin Clark-Casey (justincc)
bb28726a8b write IAR control file first in the archive rather than last 2010-10-22 18:39:40 +01:00
Justin Clark-Casey (justincc)
e7f184345e minor: add some text to the oar abort messages on assets timeout to make it clear that the oar will not be usable 2010-10-22 01:52:19 +01:00
Justin Clark-Casey (justincc)
06d37d06e6 Drop max oar loading version back to 0 from 1 2010-10-16 07:25:55 +01:00
Justin Clark-Casey (justincc)
edc31adf95 Rip out version option since it turns out that the changed object serialization format can actually be loaded by older OpenSims after all 
This bumps the OAR version to 0.4 instead, signalling some change but with backwards compatability... for now.
 2010-10-16 07:09:13 +01:00
Justin Clark-Casey (justincc)
e41b23a1a4 change --old-guids switch on the save oar command line to --version=<x> 
if x is 0, then an old version 0.3 archive is saved.  If it is anything else or missing, then a version 1.0 archive is saved
version 1.0 archives cannot be loaded on OpenSim 0.7.0.2 and earlier
also add various informational notices about what version we've saving/loading
 2010-10-16 05:38:44 +01:00
Justin Clark-Casey (justincc)
3df8d8ff76 Have OpenSim throw a strop if it tries to load an OAR with a major version that is too high for it to handle 2010-10-16 04:59:51 +01:00
Justin Clark-Casey (justincc)
1bd4219078 save oar control file first rather than in the middle so that it's the first thing we come accross on load 
this exposes a weekness with using tar where we don't control the order in which files are loaded.  can't be helped for now
 2010-10-16 03:52:11 +01:00
Diva Canto
1499607215 Made OARs use the new serialization procedure. (TPs/crossings still on the old one) Added an options argument down the pipeline. For the time being it takes --old-guids as an option to produce <Guid> instead of <UUID>. 2010-10-15 17:27:19 -07:00
John Hurliman
860b2a502f Changed SceneObjectGroup to store parts with the fast and thread-safe MapAndArray collection 2010-09-16 17:30:46 -07:00
Jeff Ames
f1f0bc23f4 Formatting cleanup. 2010-09-12 13:43:49 -04:00
John Hurliman
dd277a0d02 First pass at cleaning up thread safety in EntityManager and SceneGraph 2010-09-10 12:04:12 -07:00
Justin Clark-Casey (justincc)
b8d14fcc4a Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-09-08 01:05:56 +01:00
John Hurliman
9be1c0ff44 * Cache null account responses in the SimianUserAccountServiceConnector to avoid repeated requests for missing avatar IDs 
* Updated to OpenMetaverse r3442 to fix a timezone issue with ExpiringCache
 2010-09-07 14:41:13 -07:00
Justin Clark-Casey (justincc)
f7b28dd321 If a scene object part UUID is changed (only possible when not in a scene), then adjust the inventory items to point to the new uuid as well 2010-09-07 03:41:29 +01:00
Justin Clark-Casey (justincc)
1c0b4457cd Improve liveness by operating on list copies of SOG.Children where appropriate 2010-08-28 00:40:33 +01:00
Justin Clark-Casey (justincc)
8031f8ec09 Improve consistency of locking for SOG.m_parts in order to avoid race conditions in linking and unlinking 2010-08-26 00:08:53 +01:00
Justin Clark-Casey (justincc)
c607e6f3b8 Revert "don't report the null uuid as a missing asset on saving oars/iars" 
This reverts commit 5ce119174e.

This change led to infinite timeout since the expected number of assets no longer matched requests.
Rather than introduce yet fresh bugs with another fix, just revert this since the inaccurate report is just inconvenient
 2010-06-29 20:30:22 +01:00
Justin Clark-Casey (justincc)
a4a808818f don't report the null uuid as a missing asset on saving oars/iars 2010-06-25 21:48:19 +01:00
Justin Clark-Casey (justincc)
df2bcf7b6b remove pointless mock user account service since the real one can now be easily configured for test purposes 2010-06-04 20:56:24 +01:00
Justin Clark-Casey (justincc)
d72435693b refactor: move GetStream and URI methods from ArchiveReadRequest -> ArchiveHelpers 2010-05-28 19:21:00 +01:00
Justin Clark-Casey (justincc)
f83acf533b Fix a problem where SceneGraph.AddSceneObject() would return false on successfully adding an object rather than true, in defiance of its method documentation 
This meant that the returns were inconsistent - false would be returned both for various scene object failure conditions (e.g. root part was null) and if the object was successfully added.
 2010-05-21 21:22:53 +01:00
Justin Clark-Casey (justincc)
721c1085da make oar object filename/pathname creation a helper method 
reused in both tests and oar code
reduction in checking is outweighed by greater test clarity
 2010-05-21 20:43:11 +01:00
Justin Clark-Casey (justincc)
74ef1ed36f add prim item and test asset save in save oar unit test 2010-05-21 19:36:39 +01:00
Melanie
21cad5d3ac All scripts are now created suspended and are only unsuspended when the object 
is fully rezzed and all scripts in it are instantiated. This ensures that link
messages will not be lost on rez/region crossing and makes heavily scripted
objects reliable.
 2010-04-19 06:29:26 +01:00
Justin Clark-Casey (justincc)
e9926d13cf minor: use the static ascii and utf8 encodings instead of instantiating our own 2010-04-16 22:38:42 +01:00
Justin Clark-Casey (justincc)
bf3956aeb0 Add --skip-assets option to load oar. 
This allows you to load an oar without loading its assets.  This is useful if you know that the required assets are already in the asset service, since loading without assets is quicker.
This option will become more useful when the ability to save oars without assets is added, which should happen fairly soon.  At this point there will also be better documentation.
 2010-04-16 22:29:11 +01:00
John Hurliman
33f5d0d1e9 * UuidGatherer now tracks asset types for assets it discovers. The asset types are inferred from context 
* OAR saving will attempt to correct unknown asset types before writing broken assets to the OAR file
 2010-03-15 14:17:17 -07:00
Melanie
38ea1dd5c8 Merge branch 'master' into presence-refactor 2010-03-01 01:01:32 +00:00
Justin Clark-Casey (justincc)
93967d4a1c fix bug where region settings loaded via an oar (water height, terrain textures, etc.) were not being persisted to the database 
this meant that the loaded settings would disappear after a restart
 2010-02-26 18:30:05 +00:00
John Hurliman
df76e95aa2 Changed asset CreatorID to a string 2010-02-22 14:18:59 -08:00