ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-06-28 09:55:38 +08:00
Code Issues Packages Projects Releases Wiki Activity
11,914 Commits 5 Branches 83 Tags
82cccdeb94bf6437df79cc77009c8e19da5aaaf0
Commit Graph

112 Commits

Author SHA1 Message Date
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
Justin Clark-Casey (justincc)
f9807884a4 Add MIT/X11 licensed NDesk.Options (http://www.ndesk.org/Options) DLL to aid command line parsing 2009-11-25 15:28:43 +00:00
Justin Clark-Casey (justincc)
c083ab6824 make save and load oar slightly more robust by always closing the archive streams even if there has been an error 2009-11-24 17:47:09 +00:00
Justin Clark-Casey (justincc)
88ead9ee63 pass all command parameters to load/save oar, not just the filename 
unfortunately, these commands cannot yet be properly relocated to the region modules due to deficiencies in the region module infrastructure
 2009-11-24 17:28:38 +00:00
John Hurliman
afef1ac191 Changing the AssetBase constructors to avoid initializing assets with an unknown asset type, and log an error if it ever does happen 2009-11-05 13:10:58 -08:00
John Hurliman
7132877075 * Log progress messages when loading OAR files with a lot of assets 
* Change the PhysicsCollision callback for objects to send full contact point information. This will be used to calculate the collision plane for avatars
* Send the physics engine velocity in terse updates, not the current force being applied to the avatar. This should fix several issues including crouching through the floor and walking through walls
 2009-10-29 01:46:58 -07:00
John Hurliman
b2ed348aa2 Implemented a Watchdog class. Do not manually create Thread objects anymore, use Watchdog.StartThread(). While your thread is running call Watchdog.UpdateThread(). When it is shutting down call Watchdog.RemoveThread(). Most of the threads in OpenSim have been updated 2009-10-22 12:33:23 -07:00
dr scofield (aka dirk husemann)
2107b67f1b - cleaning up LandData/ILandObject capitalization issues 
- adding LandDataSerializer to OAR mechanics
 2009-10-02 11:31:30 +02:00
Jeff Ames
ee205e7e81 Formatting cleanup. 2009-10-01 01:17:47 +09:00
Alan M Webb
3403ae81e8 Stop a loaded OAR from generating on_rez events. This brings 
the OAR loader in line with region restart (and the correct
  behavior).
 2009-09-16 16:29:52 +02:00
Justin Clark-Casey (justincc)
71f1628578 make oar module logging a little less noisy 2009-09-07 19:11:16 +01:00
dr scofield (aka dirk husemann)
27b378ca8b switching Archiver to "new" region module scheme 2009-08-31 17:25:16 +02:00
Arthur Valadares
18aa2ea0c5 * Improves SceneSetupHelper to allow the tester to choose a real or mock, inventory and asset, service modules. The boolean startServices was replaced with realServices string. If the string contains the word asset, it will start a real asset module, if it contains inventory, it starts a real inventory. Otherwise, it use mock (NullPlugin-like) objects, for tests that don't really need functionality. 
* SetupScene is now actually sharing the asset and inventory modules if the tester wishes to have multiple regions connected. To link regions, just start SetupScene with the same CommunicationManager for all scenes. SceneSetupHelper will hold a static reference to the modules and won't initialize them again, just run the scenes through the modules AddRegion, RegionLoaded and PostInitialize.

* With the recent changes, both asset and inventory (and in the future, user) services should always be asked from the scene, not instantiated alone. The tests should reflect this new behavior and always start a scene.
 2009-08-11 12:07:54 -03:00
Diva Canto
0d8284c7a1 Removed IAssetCache. 
WARNING: PLEASE MAKE SURE TO USE THIS NEW bin/OpenSim.addin.xml
 2009-08-10 08:14:57 -07:00
Sean Dague
3dc2010da6 From: Chris Yeoh <yeohc@au1.ibm.com> 
Attached is a patch that changes the oar file saving of creation date/time to an integer
instead of a string. I did this after justincc emailed me saying there is a problem
with internationalisation doing it the old way and I said I'd fix it. Its been
tested with MySQL and I've made the changes for MSSQL but that hasn't been well tested.
 2009-06-29 15:05:12 +00:00
Justin Clarke Casey
9f2ddfd167 * Temporarily resolve another problem in http://opensimulator.org/mantis/view.php?id=3741 by disabling the loading of OAR creation information 2009-06-12 20:00:26 +00:00
Justin Clarke Casey
cb6baacc31 * minor: remove one mono warning 2009-06-12 14:29:42 +00:00
Justin Clarke Casey
874df490fb * fix build break: sigh, must remember to build before committing 2009-06-12 14:23:31 +00:00
Justin Clarke Casey
4e526778b7 * minor: make control file loading code consistent 2009-06-12 14:18:01 +00:00
Justin Clarke Casey
15b8641bef * minor: if OAR saving receives assets after timeout, just print warning, don't accidentally go on to process them 2009-06-12 14:00:50 +00:00