ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-06-01 07:15:44 +08:00
Code Issues Packages Projects Releases Wiki Activity
13,257 Commits 5 Branches 93 Tags
9a5d0984a5d4d416cf2e8560648aa94de916ad20
Commit Graph

131 Commits

Author SHA1 Message Date
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
John Hurliman
71c6559a91 Merge branch 'presence-refactor' of ssh://opensimulator.org/var/git/opensim into presence-refactor 2010-02-22 14:10:19 -08:00
John Hurliman
7665aad002 * Adds CreatorID to asset metadata. This is just the plumbing to support CreatorID, it doesn't modify database backends or OAR files to support storing/loading it 2010-02-22 13:27:17 -08:00
Melanie
1f45e6c649 Merge branch 'master' into presence-refactor 
This brings presence-refactor up to master again
 2010-02-22 03:00:59 +00:00
Diva Canto
2e7aa387f7 One more test running. 2010-02-21 19:11:48 -08:00
Justin Clark-Casey (justincc)
c767a7901c forestall bug reports about the Command error: System.EntryPointNotFoundException: CreateZStream save/load oar/iar issue by telling the user what the likely problem is 2010-02-19 22:30:46 +00:00
Jeff Ames
af265e001d Formatting cleanup. 2010-02-15 19:21:56 +09:00
Melanie
baaf660511 Merge branch 'master' into presence-refactor 
This was a large, heavily conflicted merge and things MAY have got broken.
Please check!
 2010-02-08 15:53:38 +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
a87a247f05 Revert "Updates all IRegionModules to the new style region modules." 
This reverts commit ec3c31e61e.
 2010-01-29 07:21:06 +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
Diva Canto
c5ea783526 OpenSim/Framework/Communications/Cache deleted. LibraryRootFolder deleted. 2010-01-11 07:51:33 -08:00
Melanie
3c90d834ea Remove all references to master avatar, replacing with estate owner where 
appropriate. This changes the behavior of the REST plugins and RemoteAdmin's
region creation process.
 2010-01-10 22:41:42 +00:00
Diva Canto
1e1b2ab221 * OMG! All but one references to UserProfileCacheService have been rerouted! 
* HG is seriously broken here
* Compiles. Untested.
 2010-01-10 10:40:07 -08:00
Jeff Ames
70d5b1c34c Formatting cleanup. Add copyright headers. 2010-01-04 06:17:30 +09:00
Justin Clark-Casey (justincc)
32ef1b9e23 remove stringent content type checking to make it easier to load oars directly from urls 2009-11-27 15:10:12 +00:00
Justin Clark-Casey (justincc)
59caa68e08 minor: add doc to a few parcel methods 2009-11-25 17:49:38 +00:00
Justin Clark-Casey (justincc)
c18422ad3a Implement oar merging 
An oar can now be merged with existing region contents by using the --merge option
For example, load oar --merge my.oar
Existing terrain, region settings and parcel data is left in place when an oar is merged.
See http://opensimulator.org/wiki/OpenSim_Archives#Usage for more information
 2009-11-25 16:02:47 +00:00