aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/World/Archiver (follow)
Commit message (Collapse)AuthorAgeFilesLines
* minor: add doc to a few parcel methodsJustin Clark-Casey (justincc)2009-11-251-0/+10
|
* Implement oar mergingJustin Clark-Casey (justincc)2009-11-251-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-251-1/+9
| | | | command line parsing
* make save and load oar slightly more robust by always closing the archive ↵Justin Clark-Casey (justincc)2009-11-243-13/+30
| | | | streams even if there has been an error
* pass all command parameters to load/save oar, not just the filenameJustin Clark-Casey (justincc)2009-11-241-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 Hurliman2009-11-052-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 assetsJohn Hurliman2009-10-291-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 Hurliman2009-10-221-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 issuesdr scofield (aka dirk husemann)2009-10-022-7/+38
| | | | - adding LandDataSerializer to OAR mechanics
* Formatting cleanup.Jeff Ames2009-10-016-24/+24
|
* Stop a loaded OAR from generating on_rez events. This bringsAlan M Webb2009-09-161-1/+1
| | | | | the OAR loader in line with region restart (and the correct behavior).
* make oar module logging a little less noisyJustin Clark-Casey (justincc)2009-09-071-2/+2
|
* switching Archiver to "new" region module schemedr scofield (aka dirk husemann)2009-08-311-6/+24
|
* * Improves SceneSetupHelper to allow the tester to choose a real or mock, ↵Arthur Valadares2009-08-111-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 Canto2009-08-101-3/+4
| | | | WARNING: PLEASE MAKE SURE TO USE THIS NEW bin/OpenSim.addin.xml
* From: Chris Yeoh <yeohc@au1.ibm.com>Sean Dague2009-06-292-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 Casey2009-06-121-2/+4
| | | | http://opensimulator.org/mantis/view.php?id=3741 by disabling the loading of OAR creation information
* * minor: remove one mono warningJustin Clarke Casey2009-06-121-1/+0
|
* * fix build break: sigh, must remember to build before committingJustin Clarke Casey2009-06-121-2/+1
|
* * minor: make control file loading code consistentJustin Clarke Casey2009-06-122-18/+12
|
* * minor: if OAR saving receives assets after timeout, just print warning, ↵Justin Clarke Casey2009-06-121-0/+2
| | | | don't accidentally go on to process them
* * minor: remove warning from unused fieldJustin Clarke Casey2009-06-121-5/+0
|
* * Fix problem where known missing assets would stop save oar ever completingJustin Clarke Casey2009-06-051-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
* * Add oar saving timeoutJustin Clarke Casey2009-06-052-1/+128
| | | | | | | | | * If an oar save fails to get responses to all asset requests to the asset service then timeout after 60 seconds * Timeout executes abort, since missing assets in an OAR seems bad * This means that oar saves won't permanently hang and instead can be retried if something goes wrong with the asset service * This is not a solution to mantis 3714. Hopefully a fix will be along shortly since I can now consistently reproduce that problem
* From: Chris Yeoh <yeohc@au1.ibm.com>Dr Scofield2009-06-032-0/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds oar file date and time (UTC) meta data to an oar file when it is created. It also adds a unique ID, though this id does not in anyway identify the machine that the oar file was created on. When an oar file with this meta data is loaded this extra information is saved with the region settings and available via LSL through: - osLoadedCreationDate() - osLoadedCreationTime() - osLoadedCreationID() If there is no meta data these fields will be blank. Subsequent oar file loads will erase the information for the previous oar file load. Persistence has only been implemented for MySQL, the other backends need updating. Overall this allows us to much more easily identify the specific version of software that clients are using. Its very straightforward to edit the oar file to change the ID string to be something more human friendly. Included in the patch is a new file OpenSim/Data/MySQL/Resources/030_RegionStore.sql required for the MySQL DB migration. btw I had a chat with justincc about this a few weeks ago since he wrote the oar file import/export and he sounded happy to accept something that included date/time information but didn't want anything that would silently leak private information like machine names.
* * Add simple original xml serialization testJustin Clarke Casey2009-06-021-8/+2
|
* * minor: change the name of one serialization method to match its counterpartJustin Clarke Casey2009-06-011-1/+1
|
* * Fix race condition in save oarJustin Clarke Casey2009-06-013-28/+46
|
* Minor: Change OpenSim to OpenSimulator in older copyright headers and ↵Jeff Ames2009-06-018-8/+8
| | | | LICENSE.txt.
* * Add xml2 load testJustin Clarke Casey2009-05-291-2/+0
|
* * Take another attempt at http://opensimulator.org/mantis/view.php?id=3191Justin Clarke Casey2009-05-191-12/+14
| | | | | | * Return something more sensible if a file isn't found
* * minor: another attempt at http://opensimulator.org/mantis/view.php?id=3191Justin Clarke Casey2009-05-181-1/+1
| | | | | | * didn't realize that we were getting back plain old exceptions
* * Resolve http://opensimulator.org/mantis/view.php?id=3191Justin Clarke Casey2009-05-181-4/+4
| | | | | | * Catch directory exception on load oar as well as file exception
* * Re-enable save oar test by loading asset data plugins from test mock classJustin Clarke Casey2009-05-181-120/+120
| | | | | | * Actually spit out the exception caught by the plugin loader - not much point having plugins throw exceptions if we are just going to ignore them
* From: Alan Webb <alan_webb@us.ibm.com>Dr Scofield2009-05-181-0/+1
| | | | | | | | | Fixes: [1] Sharing exception on remote OAR management [2] Occasional 505 error talking to Tomcat [3] Occasional mono aborts caused by mlog in the script engine's app domain (mono 2.4)
* * Resolve bug where save oar would never complete if any assets were missingJustin Clarke Casey2009-05-153-17/+11
|
* Heart surgery on asset service code bits. Affects OpenSim.ini configuration ↵diva2009-05-154-130/+136
| | | | | | | | | | | | -- please see the example. Affects region servers only. This may break a lot of things, but it needs to go in. It was tested in standalone and the UCI grid, but it needs a lot more testing. Known problems: * HG asset transfers are borked for now * missing texture is missing * 3 unit tests commented out for now
* * When saving an oar, save assets when immediately received rather than ↵Justin Clarke Casey2009-05-144-121/+122
| | | | | | | | | storing them all up in memory * Hopefully this will remove out of memory problems when saving large oars on machines without much memory * It may also speed up saving of large oars
* * refactor: break some of xml2 serialization out of sogJustin Clarke Casey2009-05-141-1/+2
|
* remove misleading commentSean Dague2009-05-071-3/+0
|
* instrument most of the tests with a new InMethod function that may help us ↵Sean Dague2009-05-071-0/+3
| | | | | | | figure out where that pesky deadlock is during test runs.
* minor: Inconsquential change to provoke another buildJustin Clarke Casey2009-05-071-1/+1
|
* * Get rid of some extraneous debug log output from the last commitJustin Clarke Casey2009-04-282-4/+4
|
* * Stop oar loading barfing if the archive contains directory entriesJustin Clarke Casey2009-04-282-12/+44
|
* * Write separate unit test for replicating iar structure to a user inventoryJustin Clarke Casey2009-04-241-3/+2
|
* * Write basic, incomplete load iar testJustin Clarke Casey2009-04-241-6/+0
|
* * refactor: move archive user inventory item serialization out to a separate ↵Justin Clarke Casey2009-04-231-1/+1
| | | | file
* From: Alan Webb <alan_webb@us.ibm.com>Dr Scofield2009-04-221-4/+11
| | | | | | | | Changes to enable script state persistence across non-restart serialization situations (inventory/OAR/attachments) Also fixing test cases for OAR and IAR so they don't barf with the new code.
* fixes System.UnauthorizedAccessExceptions when trying to load OARs fromDr Scofield2009-04-171-2/+2
| | | | | read-only files on linux.
* * Make it possible to add a request id to load and save oar requestsJustin Clarke Casey2009-04-155-23/+51
| | | | | | * This allows specific requests to be identified.