aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/World/Archiver (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-05-271-3/+3
|\
| * Comment out accidentally left in log line that was printing out the control f...Justin Clark-Casey (justincc)2012-05-241-3/+3
* | Merge branch 'master' into careminsterMelanie2012-05-191-14/+24
|\ \ | |/
| * Add size of region to OAR control file. Megaregions (sw root OARs when saved...Justin Clark-Casey (justincc)2012-05-191-14/+24
* | Merge branch 'master' into careminsterMelanie2012-05-192-41/+74
|\ \ | |/
| * Remove recent IRegionCombinerModule.IsMegaregion(). In theory, there can be ...Justin Clark-Casey (justincc)2012-05-191-1/+1
| * Add is_megaregion flag into oar control file. Not currently read - for futur...Justin Clark-Casey (justincc)2012-05-192-41/+74
* | Merge branch 'master' into careminsterMelanie2012-05-162-0/+54
|\ \ | |/
| * Route OAR SOG loading through the common SceneObjectSerializer.FromXml2Format...Justin Clark-Casey (justincc)2012-05-161-2/+1
| * Fix issue where loading OARs could sometimes result in link numbers being reo...Justin Clark-Casey (justincc)2012-05-152-1/+56
* | Merge branch 'master' into careminsterMelanie2012-05-143-2/+29
|\ \ | |/
| * Save the Telehub and its Spawn Points in the OAROren Hurvitz2012-05-143-2/+29
| * Revert "Save the Telehub and its Spawn Points in the OAR"Justin Clark-Casey (justincc)2012-05-123-29/+2
| * Save the Telehub and its Spawn Points in the OAROren Hurvitz2012-05-103-2/+29
| * Revert "Better error handling if Load OAR or Save OAR fail"Justin Clark-Casey (justincc)2012-05-073-32/+6
| * Better error handling if Load OAR or Save OAR failOren Hurvitz2012-05-073-6/+32
* | Merge branch 'master' into careminsterMelanie2012-04-271-1/+4
|\ \ | |/
| * Use DotNetZip to compress OARs and IARs.Oren Hurvitz2012-04-271-1/+4
* | Merge branch 'master' into careminsterMelanie2012-04-272-5/+10
|\ \ | |/
| * Add regression test for teleporting an agent between separated regions on the...Justin Clark-Casey (justincc)2012-04-271-3/+3
| * When creating an OAR, objects where the user is the Creator are always includ...Oren Hurvitz2012-04-261-2/+7
* | Merge branch 'master' into careminsterMelanie2012-04-231-2/+2
|\ \ | |/
| * Fix bug where setting phantom on a prim would result in a server log message ...Justin Clark-Casey (justincc)2012-04-221-2/+2
* | Merge branch 'master' into careminsterMelanie2012-03-113-16/+24
|\ \ | |/
| * Fix TestSaveOarNoAssets() by not launch a no-assets request on a separate thr...Justin Clark-Casey (justincc)2012-03-101-1/+1
| * minor: rearrange some save oar messages so they say what they're about to do ...Justin Clark-Casey (justincc)2012-03-101-8/+7
| * On OAR saving, try fetch assets serially rather than firing all the requests ...Justin Clark-Casey (justincc)2012-03-102-9/+18
* | Merge branch 'master' into careminsterMelanie2012-02-041-2/+2
|\ \ | |/
| * Changed save oar and save iar parameter -p|--profile to -h|--home, including ...Snoopy Pfeffer2012-02-031-2/+2
* | Merge branch 'master' into careminsterMelanie2012-01-284-14/+89
|\ \ | |/
| * Add experimental --publish option to "save oar" so that OARs reloaded to the ...Justin Clark-Casey (justincc)2012-01-284-14/+89
* | Merge branch 'master' into careminsterMelanie2012-01-212-1/+3
|\ \ | |/
| * Add basic request and send image regression tests for LLImageManagerJustin Clark-Casey (justincc)2012-01-191-1/+1
| * RegionReady:BlueWall2012-01-181-0/+2
* | Merge branch 'master' into careminsterMelanie2012-01-141-1/+9
|\ \ | |/
| * Update RegionReadyModuleBlueWall2012-01-131-1/+9
* | Merge branch 'master' into careminsterMelanie2012-01-122-2/+12
|\ \ | |/
| * HG: normalize all externalized user ULRs to be the Home URL, i.e. the locatio...Diva Canto2012-01-121-2/+6
| * Add a check to see if an asset exists before recreating it whileMic Bowman2012-01-101-0/+6
* | Merge commit 'f16d125027aba098e45dc026f9d507a430bc2b10' into bigmergeMelanie2011-10-251-2/+2
|\ \ | |/
| * Change wording on asset requests.Justin Clark-Casey (justincc)2011-10-191-2/+2
* | Bring us up to date.Tom2011-09-144-5/+112
|\ \ | |/
| * When creating an OAR, optionally exclude objects according to their permissionsOren Hurvitz2011-09-122-3/+104
| * Comment out the part of the load oar code that zeroes out prim sit target ori...Justin Clark-Casey (justincc)2011-09-092-2/+8
* | Resolve merge commits, stage 1Tom2011-09-041-9/+9
|\ \ | |/
| * rename TestHelper => TestHelpers for consistencyJustin Clark-Casey (justincc)2011-08-061-5/+5
| * rename test SceneSetupHelpers -> SceneHelpers for consistencyJustin Clark-Casey (justincc)2011-08-061-4/+4
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-06-201-2/+2
|\ \ | |/
| * tweak messages. Make verbose inventory item save message give the item name ...Justin Clark-Casey (justincc)2011-06-141-2/+2
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-06-112-0/+5
|\ \ | |/