Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Changed asset CreatorID to a string | John Hurliman | 2010-02-22 | 2 | -2/+2 |
| | |||||
* | Merge branch 'presence-refactor' of ssh://opensimulator.org/var/git/opensim ↵ | John Hurliman | 2010-02-22 | 3 | -15/+39 |
|\ | | | | | | | into presence-refactor | ||||
| * | Merge branch 'master' into presence-refactor | Melanie | 2010-02-22 | 3 | -14/+38 |
| |\ | | | | | | | | | | This brings presence-refactor up to master again | ||||
| | * | forestall bug reports about the Command error: ↵ | Justin Clark-Casey (justincc) | 2010-02-19 | 2 | -2/+26 |
| | | | | | | | | | | | | System.EntryPointNotFoundException: CreateZStream save/load oar/iar issue by telling the user what the likely problem is | ||||
| | * | Formatting cleanup. | Jeff Ames | 2010-02-15 | 1 | -12/+12 |
| | | | |||||
| * | | One more test running. | Diva Canto | 2010-02-21 | 1 | -1/+1 |
| | | | |||||
* | | | * Adds CreatorID to asset metadata. This is just the plumbing to support ↵ | John Hurliman | 2010-02-22 | 2 | -2/+2 |
|/ / | | | | | | | CreatorID, it doesn't modify database backends or OAR files to support storing/loading it | ||||
* | | Merge branch 'master' into presence-refactor | Melanie | 2010-02-08 | 3 | -114/+219 |
|\ \ | |/ | | | | | | | This was a large, heavily conflicted merge and things MAY have got broken. Please check! | ||||
| * | use common sop2 setup for TestMergeOarV0_2() | Justin Clark-Casey (justincc) | 2010-01-29 | 1 | -16/+12 |
| | | |||||
| * | make TestSaveOarV0_2() use a common part2 construction | Justin Clark-Casey (justincc) | 2010-01-29 | 1 | -18/+14 |
| | | |||||
| * | use common part1 createio nin TestMergeOarV0_2() | Justin Clark-Casey (justincc) | 2010-01-29 | 1 | -16/+5 |
| | | |||||
| * | minor: swap which part uses the automatically set up scene in TestMergeOarV0_2() | Justin Clark-Casey (justincc) | 2010-01-29 | 1 | -25/+13 |
| | | |||||
| * | use common part1 creation in ArchiverTests.TestLoadOarV0_2() | Justin Clark-Casey (justincc) | 2010-01-29 | 1 | -30/+28 |
| | | |||||
| * | refactor out scene object 1 creation n ArchiverTetss | Justin Clark-Casey (justincc) | 2010-01-29 | 1 | -44/+22 |
| | | |||||
| * | factor out scene setup in ArchiverTests | Justin Clark-Casey (justincc) | 2010-01-29 | 1 | -40/+53 |
| | | |||||
| * | Add method to get all items with the same name from a particular prim | Justin Clark-Casey (justincc) | 2010-01-29 | 1 | -5/+4 |
| | | | | | | | | Extend load oar test to check loading of a sound item | ||||
| * | Revert "Updates all IRegionModules to the new style region modules." | Melanie | 2010-01-29 | 1 | -1/+0 |
| | | | | | | | | This reverts commit ec3c31e61e5e540f822891110df9bc978655bbaf. | ||||
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-01-23 | 3 | -3/+151 |
| |\ | |||||
| | * | Add first part of test for checking restore of task inventory items on oar load | Justin Clark-Casey (justincc) | 2010-01-22 | 2 | -1/+49 |
| | | | | | | | | | | | | Passes but not yet complete | ||||
| | * | complete assertion checks of all other oar loaded region settings | Justin Clark-Casey (justincc) | 2010-01-22 | 1 | -0/+28 |
| | | | |||||
| | * | Allow oar loading to work even if an estate module is not present | Justin Clark-Casey (justincc) | 2010-01-22 | 2 | -2/+74 |
| | | | | | | | | | | | | Write bare bones unit test for region setting loads | ||||
| * | | Updates all IRegionModules to the new style region modules. | Revolution | 2010-01-23 | 1 | -0/+1 |
| |/ | | | | | | | Signed-off-by: Melanie <melanie@t-data.com> | ||||
* | | OpenSim/Framework/Communications/Cache deleted. LibraryRootFolder deleted. | Diva Canto | 2010-01-11 | 2 | -2/+2 |
| | | |||||
* | | Remove all references to master avatar, replacing with estate owner where | Melanie | 2010-01-10 | 1 | -10/+6 |
| | | | | | | | | | | appropriate. This changes the behavior of the REST plugins and RemoteAdmin's region creation process. | ||||
* | | * OMG! All but one references to UserProfileCacheService have been rerouted! | Diva Canto | 2010-01-10 | 1 | -2/+3 |
|/ | | | | | * HG is seriously broken here * Compiles. Untested. | ||||
* | Formatting cleanup. Add copyright headers. | Jeff Ames | 2010-01-04 | 3 | -4/+4 |
| | |||||
* | remove stringent content type checking to make it easier to load oars ↵ | Justin Clark-Casey (justincc) | 2009-11-27 | 1 | -2/+5 |
| | | | | directly from urls | ||||
* | minor: add doc to a few parcel methods | Justin Clark-Casey (justincc) | 2009-11-25 | 1 | -0/+10 |
| | |||||
* | Implement oar merging | Justin Clark-Casey (justincc) | 2009-11-25 | 1 | -6/+10 |
| | | | | | | | 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 | ||||
* | Add MIT/X11 licensed NDesk.Options (http://www.ndesk.org/Options) DLL to aid ↵ | Justin Clark-Casey (justincc) | 2009-11-25 | 1 | -1/+9 |
| | | | | command line parsing | ||||
* | make save and load oar slightly more robust by always closing the archive ↵ | Justin Clark-Casey (justincc) | 2009-11-24 | 3 | -13/+30 |
| | | | | streams even if there has been an error | ||||
* | pass all command parameters to load/save oar, not just the filename | Justin Clark-Casey (justincc) | 2009-11-24 | 1 | -0/+37 |
| | | | | unfortunately, these commands cannot yet be properly relocated to the region modules due to deficiencies in the region module infrastructure | ||||
* | Changing the AssetBase constructors to avoid initializing assets with an ↵ | John Hurliman | 2009-11-05 | 2 | -4/+5 |
| | | | | unknown asset type, and log an error if it ever does happen | ||||
* | * Log progress messages when loading OAR files with a lot of assets | John Hurliman | 2009-10-29 | 1 | -0/+3 |
| | | | | | * 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 | ||||
* | Implemented a Watchdog class. Do not manually create Thread objects anymore, ↵ | John Hurliman | 2009-10-22 | 1 | -5/+3 |
| | | | | 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 | ||||
* | - cleaning up LandData/ILandObject capitalization issues | dr scofield (aka dirk husemann) | 2009-10-02 | 2 | -7/+38 |
| | | | | - adding LandDataSerializer to OAR mechanics | ||||
* | Formatting cleanup. | Jeff Ames | 2009-10-01 | 6 | -24/+24 |
| | |||||
* | Stop a loaded OAR from generating on_rez events. This brings | Alan M Webb | 2009-09-16 | 1 | -1/+1 |
| | | | | | the OAR loader in line with region restart (and the correct behavior). | ||||
* | make oar module logging a little less noisy | Justin Clark-Casey (justincc) | 2009-09-07 | 1 | -2/+2 |
| | |||||
* | switching Archiver to "new" region module scheme | dr scofield (aka dirk husemann) | 2009-08-31 | 1 | -6/+24 |
| | |||||
* | * Improves SceneSetupHelper to allow the tester to choose a real or mock, ↵ | Arthur Valadares | 2009-08-11 | 1 | -1/+1 |
| | | | | | | | | 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. | ||||
* | Removed IAssetCache. | Diva Canto | 2009-08-10 | 1 | -3/+4 |
| | | | | WARNING: PLEASE MAKE SURE TO USE THIS NEW bin/OpenSim.addin.xml | ||||
* | From: Chris Yeoh <yeohc@au1.ibm.com> | Sean Dague | 2009-06-29 | 2 | -13/+8 |
| | | | | | | | | 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. | ||||
* | * Temporarily resolve another problem in ↵ | Justin Clarke Casey | 2009-06-12 | 1 | -2/+4 |
| | | | | http://opensimulator.org/mantis/view.php?id=3741 by disabling the loading of OAR creation information | ||||
* | * minor: remove one mono warning | Justin Clarke Casey | 2009-06-12 | 1 | -1/+0 |
| | |||||
* | * fix build break: sigh, must remember to build before committing | Justin Clarke Casey | 2009-06-12 | 1 | -2/+1 |
| | |||||
* | * minor: make control file loading code consistent | Justin Clarke Casey | 2009-06-12 | 2 | -18/+12 |
| | |||||
* | * minor: if OAR saving receives assets after timeout, just print warning, ↵ | Justin Clarke Casey | 2009-06-12 | 1 | -0/+2 |
| | | | | don't accidentally go on to process them | ||||
* | * minor: remove warning from unused field | Justin Clarke Casey | 2009-06-12 | 1 | -5/+0 |
| | |||||
* | * Fix problem where known missing assets would stop save oar ever completing | Justin Clarke Casey | 2009-06-05 | 1 | -1/+3 |
| | | | | | | | | | * Issue was that region server was silently dropping an XmlException caused by trying to deserialize the blank asset service response * So make asset service return http status NOT FOUND rather than OK in accordance with REST * and interpret this correctly in the async response so that a null object is sent back * This means that this fix won't be active until both region simulator and server reach this revision |