aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/World/Archiver (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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
| * Revert "don't report the null uuid as a missing asset on saving oars/iars"Justin Clark-Casey (justincc)2010-06-291-5/+3
| * don't report the null uuid as a missing asset on saving oars/iarsJustin Clark-Casey (justincc)2010-06-251-3/+5
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-06-041-1/+1
|\ \ | |/
| * remove pointless mock user account service since the real one can now be easi...Justin Clark-Casey (justincc)2010-06-041-1/+1
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-05-282-63/+65
|\ \ | |/
| * refactor: move GetStream and URI methods from ArchiveReadRequest -> ArchiveHe...Justin Clark-Casey (justincc)2010-05-282-63/+65
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-05-215-42/+106
|\ \ | |/
| * Fix a problem where SceneGraph.AddSceneObject() would return false on success...Justin Clark-Casey (justincc)2010-05-211-1/+0
| * make oar object filename/pathname creation a helper methodJustin Clark-Casey (justincc)2010-05-214-38/+75
| * add prim item and test asset save in save oar unit testJustin Clark-Casey (justincc)2010-05-212-3/+31
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-04-193-28/+39
|\ \ | |/
| * All scripts are now created suspended and are only unsuspended when the objectMelanie2010-04-191-0/+1
| * minor: use the static ascii and utf8 encodings instead of instantiating our ownJustin Clark-Casey (justincc)2010-04-161-6/+3
| * Add --skip-assets option to load oar.Justin Clark-Casey (justincc)2010-04-163-24/+37
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-03-182-12/+25
|\ \ | |/
| * * UuidGatherer now tracks asset types for assets it discovers. The asset type...John Hurliman2010-03-152-12/+25
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-03-034-34/+60
|\ \ | |/
| * Merge branch 'master' into presence-refactorMelanie2010-03-011-0/+2
| |\
| | * fix bug where region settings loaded via an oar (water height, terrain textur...Justin Clark-Casey (justincc)2010-02-261-0/+2
| * | Changed asset CreatorID to a stringJohn Hurliman2010-02-222-2/+2
| * | Merge branch 'presence-refactor' of ssh://opensimulator.org/var/git/opensim i...John Hurliman2010-02-223-15/+39
| |\ \
| | * \ Merge branch 'master' into presence-refactorMelanie2010-02-223-14/+38
| | |\ \ | | | |/
| | | * forestall bug reports about the Command error: System.EntryPointNotFoundExcep...Justin Clark-Casey (justincc)2010-02-192-2/+26
| | | * Formatting cleanup.Jeff Ames2010-02-151-12/+12
| | * | One more test running.Diva Canto2010-02-211-1/+1