aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/World/Archiver (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-01-044-39/+56
|\
| * Changed locks to prevent deadlocks (especially during multi-region Load OAR)Oren Hurvitz2013-01-021-15/+27
| * If Save OAR/IAR times-out while waiting for assets then notify the caller tha...Oren Hurvitz2013-01-023-24/+29
* | Merge branch 'master' into careminsterMelanie2012-11-253-144/+209
|\ \ | |/
| * In ArchiverTests, use the local instantiated SceneManager rather than potenti...Justin Clark-Casey (justincc)2012-11-241-20/+7
| * Fix bug where loading an OAR with a deeded parcel would always set the parcel...Justin Clark-Casey (justincc)2012-11-243-140/+213
| * minor: Add some currently commented out debug log lines for investigating iss...Justin Clark-Casey (justincc)2012-11-231-0/+5
* | Merge branch 'master' into careminsterMelanie2012-11-131-0/+2
|\ \ | |/
| * Another 10 modules' directives moved from .addin.xmlDiva Canto2012-11-121-0/+2
* | Merge branch 'master' into careminsterMelanie2012-11-011-2/+4
|\ \ | |/
| * Comment out checks not to overwrite existing IAR/OAR files for now on "save i...Justin Clark-Casey (justincc)2012-11-011-2/+4
* | Merge branch 'master' into careminsterMelanie2012-10-281-0/+4
|\ \ | |/
| * Fix "save iar" hanging permanently if the asset request phase times out.Justin Clark-Casey (justincc)2012-10-261-0/+4
* | Merge branch 'master' into careminsterMelanie2012-10-262-8/+12
|\ \ | |/
| * Fixed saving non-square multi-region OARsOren Hurvitz2012-10-261-1/+1
| * Get "save oar" and "save iar" to tell you in a more friendly manner if the fi...Justin Clark-Casey (justincc)2012-10-241-7/+11
* | Merge branch 'master' into careminsterMelanie2012-10-201-2/+2
|\ \ | |/
| * Fix a few minor issues in ArchiveReadRequest logging.Justin Clark-Casey (justincc)2012-10-191-2/+2
| * Revert "Added request.Proxy=null everywhere, as discussed in http://stackover...Diva Canto2012-09-301-1/+0
| * Added request.Proxy=null everywhere, as discussed in http://stackoverflow.com...Diva Canto2012-09-301-0/+1
* | Merge branch 'master' into careminsterMelanie2012-09-241-1/+4
|\ \ | |/
| * Correctly override and call base OpenSimTestCase.SetUp() method in GridConnec...Justin Clark-Casey (justincc)2012-09-191-1/+4
* | Merge branch 'master' into careminsterMelanie2012-09-169-745/+1675
|\ \ | |/
| * Added unit tests for multi-region OARsOren Hurvitz2012-09-141-58/+326
| * Rename ArchiveWriteRequestPreparatio nto ArchiveWriteRequest since after the ...Justin Clark-Casey (justincc)2012-09-143-9/+9
| * Support multi-region OAR filesOren Hurvitz2012-09-148-395/+1057
* | Merge branch 'master' into careminsterMelanie2012-09-071-1/+1
|\ \ | |/
| * If reusing dynamic textures, do not reuse small data length textures that fal...Justin Clark-Casey (justincc)2012-09-061-1/+1
* | Merge branch 'master' into careminsterMelanie2012-08-231-1/+62
|\ \ | |/
| * When loading an OAR, validate any group UUIDs and properly reconstruct parcel...Justin Clark-Casey (justincc)2012-08-201-1/+62
* | Merge branch 'master' into careminsterMelanie2012-08-041-1/+1
|\ \ | |/
| * Fix old regression that stopped saving parcel owner data in OARs.Justin Clark-Casey (justincc)2012-08-031-1/+1
* | Merge branch 'master' into careminsterMelanie2012-08-031-5/+11
|\ \ | |/
| * Fixed a rare bug that caused Save OAR to fail because it thought it had timed...Oren Hurvitz2012-08-031-5/+11
* | Merge branch 'master' into careminsterMelanie2012-07-121-2/+0
|\ \ | |/
| * Where possible, use the system Encoding.ASCII and Encoding.UTF8 rather than c...Justin Clark-Casey (justincc)2012-07-111-2/+0
* | 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
generated by cgit v1.1 at 2024-12-22 19:34:31 +0000