aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs (follow)
Commit message (Expand)AuthorAgeFilesLines
* seems to compile ( tests comented out)UbitUmarov2015-09-021-81/+3
* bad merge?UbitUmarov2015-09-011-1/+91
|\
| * try to implement core load oar optionsUbitUmarov2015-08-241-90/+199
| * Merge branch 'master' into careminsterMelanie2013-11-231-2/+2
| |\
| * \ Merge branch 'master' into careminsterMelanie2013-01-041-15/+27
| |\ \
| * \ \ Merge branch 'master' into careminsterMelanie2012-11-251-8/+17
| |\ \ \
| * \ \ \ Merge branch 'master' into careminsterMelanie2012-10-201-2/+2
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into careminsterMelanie2012-09-161-90/+289
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-08-231-1/+62
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-05-161-0/+1
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-05-141-1/+24
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-01-281-8/+8
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-01-121-0/+6
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Bring us up to date.Tom2011-09-141-2/+2
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminster-presence-refactorMelanie2011-06-111-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminster-presence-refactorMelanie2011-05-141-4/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminster-presence-refactorMelanie2011-04-211-1/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminster-presence-refactorMelanie2011-01-281-28/+44
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminster-presence-refactorMelanie2011-01-271-0/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminster-presence-refactorMelanie2010-11-221-4/+25
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminster-presence-refactorMelanie2010-11-211-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminster-presence-refactorMelanie2010-10-231-12/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminster-presence-refactorMelanie2010-10-161-0/+22
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminster-presence-refactorMelanie2010-09-171-5/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminster-presence-refactorMelanie2010-08-301-1/+21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminster-presence-refactorMelanie2010-08-261-22/+22
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminster-presence-refactorMelanie2010-05-281-63/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminster-presence-refactorMelanie2010-05-211-2/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminster-presence-refactorMelanie2010-04-191-19/+27
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminster-presence-refactorMelanie2010-03-031-18/+32
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2010-01-261-2/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2010-01-031-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2009-11-281-2/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2009-11-251-7/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Drop all locking of part.TaskInventory in favour of a ReaderWriterLockSlim lo...CasperW2009-11-241-11/+10
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | refactor: Move methods to start a monitored thread, start work in its own thr...Justin Clark-Casey (justincc)2014-11-251-2/+2
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For monitoring purposes, start non-timeout tasks (which do not currently use ...Justin Clark-Casey (justincc)2014-09-051-2/+3
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Close streams immediately when we finish using themOren Hurvitz2014-07-211-9/+10
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | new version of patch to add default-user switch new version :qw :wq updated v...Matt Lehmann2014-05-061-0/+2
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updated version of default user switch for load oar :q :qMatt Lehmann2014-05-061-5/+17
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed: the parcel flag "Allow Scripts from Group" should only check if the pa...Oren Hurvitz2014-04-201-5/+9
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed default timeout when starting scripts after Load OAROren Hurvitz2014-03-281-2/+2
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Load OAR, correctly restore group-owned objectsOren Hurvitz2014-03-241-3/+3
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Load OAR: Zero isn't a valid Group IDOren Hurvitz2014-03-241-4/+2
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During Load OAR, fix the User and Group ID's in objects that are embedded in ...Oren Hurvitz2014-03-241-53/+77
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix displacement and location operations on legacy trees and grass inRobert Adams2014-02-151-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add "--no-objects" parameter to 'load oar'.Robert Adams2014-02-021-1/+4
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change new 'load oar' parameters to be hyphenated to be consistant withRobert Adams2014-02-021-3/+3
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement terrain merging in TerrainChannel.Robert Adams2014-02-021-16/+24
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | varregion: remove --noterrain and --noparcel parameters in 'load oar'.Robert Adams2014-01-191-9/+46