aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/World/Archiver (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminster-presence-refactorMelanie2011-01-281-28/+44
|\
| * Refactor: Break out LoadObjects() and LoadParcels() from a longer methodJustin Clark-Casey (justincc)2011-01-271-28/+44
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-01-271-0/+9
|\ \ | |/
| * When an oar is loaded, do not create a default parcel before loading the parc...Justin Clark-Casey (justincc)2011-01-271-1/+1
| * Show local IDs in "land show" output.Justin Clark-Casey (justincc)2011-01-271-0/+5
| * Fix OAR parcel loading so that old parcels are replaced by the new instead of...Justin Clark-Casey (justincc)2011-01-271-0/+4
| * Added more debug messages under the -verbose option.Diva Canto2011-01-081-2/+6
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-123-35/+34
|\ \ | |/
| * Drop current OAR version back to 0.5 since these are currently now compatible...Justin Clark-Casey (justincc)2010-12-113-35/+34
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-032-7/+30
|\ \ | |/
| * Preservation of creator information now also working in IARs. Cleaned up usag...Diva Canto2010-11-292-7/+30
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-11-231-1/+1
|\ \ | |/
| * Fix: Allow use of parameters without specifying a file path with command "sav...Marck2010-11-231-1/+1
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-11-222-4/+26
|\ \ | |/
| * Added creator info across the board -- TaskInventoryItems and InventoryItems ...Diva Canto2010-11-211-3/+7
| * Global creator information working on MySQL DB and on load/save OARs. Creator...Diva Canto2010-11-212-2/+20
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-11-213-95/+132
|\ \ | |/
| * Knock V0_2 decals off archive tests since they're misleadingJustin Clark-Casey (justincc)2010-11-201-8/+8
| * Fix unit tests and save problemsJustin Clark-Casey (justincc)2010-11-203-3/+4
| * correct build break. for some reason, xbuild didn't rebuild test dllsJustin Clark-Casey (justincc)2010-11-201-2/+2
| * Bump oar version to 1.0 from 0.5Justin Clark-Casey (justincc)2010-11-201-83/+119
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-11-022-16/+10
|\ \ | |/
| * Old deserialization can't deal with commas in flag fields. Making use of -ver...Diva Canto2010-11-022-16/+10
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-271-3/+3
|\ \ | |/
| * Formatting cleanup.Jeff Ames2010-10-271-3/+3
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-233-14/+8
|\ \ | |/
| * Implement guard against trying to load incompatible version IARsJustin Clark-Casey (justincc)2010-10-221-1/+1
| * start parsing iar control fileJustin Clark-Casey (justincc)2010-10-221-1/+1
| * slightly simplify oar control file loading codeJustin Clark-Casey (justincc)2010-10-221-10/+3
| * write IAR control file first in the archive rather than lastJustin Clark-Casey (justincc)2010-10-221-1/+2
| * minor: add some text to the oar abort messages on assets timeout to make it c...Justin Clark-Casey (justincc)2010-10-221-1/+1
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-165-52/+114
|\ \ | |/
| * Drop max oar loading version back to 0 from 1Justin Clark-Casey (justincc)2010-10-161-1/+1
| * Rip out version option since it turns out that the changed object serializati...Justin Clark-Casey (justincc)2010-10-162-7/+11
| * change --old-guids switch on the save oar command line to --version=<x>Justin Clark-Casey (justincc)2010-10-165-9/+31
| * Have OpenSim throw a strop if it tries to load an OAR with a major version th...Justin Clark-Casey (justincc)2010-10-162-1/+23
| * save oar control file first rather than in the middle so that it's the first ...Justin Clark-Casey (justincc)2010-10-163-38/+41
| * Made OARs use the new serialization procedure. (TPs/crossings still on the ol...Diva Canto2010-10-153-14/+25
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-171-5/+1
|\ \ | |/
| * Changed SceneObjectGroup to store parts with the fast and thread-safe MapAndA...John Hurliman2010-09-161-5/+1
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-133-7/+10
|\ \ | |/
| * Formatting cleanup.Jeff Ames2010-09-121-4/+4
| * First pass at cleaning up thread safety in EntityManager and SceneGraphJohn Hurliman2010-09-101-1/+1
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-09-081-1/+4
| |\
| | * * Cache null account responses in the SimianUserAccountServiceConnector to av...John Hurliman2010-09-071-1/+4
| * | If a scene object part UUID is changed (only possible when not in a scene), t...Justin Clark-Casey (justincc)2010-09-071-1/+1
| |/
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-08-301-1/+21
|\ \ | |/
| * Improve liveness by operating on list copies of SOG.Children where appropriateJustin Clark-Casey (justincc)2010-08-281-28/+29
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-08-261-22/+22
|\ \ | |/
| * Improve consistency of locking for SOG.m_parts in order to avoid race conditi...Justin Clark-Casey (justincc)2010-08-261-26/+29