aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/World (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/va...Melanie2010-10-231-20/+8
|\
| * Prevent database lookups on every avatar movement when land is set to groupMelanie2010-10-231-20/+8
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-234-16/+10
|\ \ | |/ |/|
| * Revert "Merge remote branch 'otakup0pe/mantis5110'"Justin Clark-Casey (justincc)2010-10-221-2/+2
| * Merge remote branch 'otakup0pe/mantis5110'Justin Clark-Casey (justincc)2010-10-221-2/+2
| |\
| | * Merge branch 'hg16' into mantis5110Jonathan Freedman2010-10-221-2/+2
| | |\
| | | * Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-177-60/+129
| | | |\
| | | * \ Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-072-22/+52
| | | |\ \
| | | * \ \ Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-052-3/+18
| | | |\ \ \
| | | * \ \ \ Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-051-0/+6
| | | |\ \ \ \
| | | * \ \ \ \ Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-039-47/+1413
| | | |\ \ \ \ \
| | | * | | | | | * additional serveruri cleanupJonathan Freedman2010-10-031-1/+1
| | | * | | | | | * refactor refactor refactor ServerURI 4 lyfeJonathan Freedman2010-10-021-1/+1
| | * | | | | | | 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
| | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | Revert "* refactor refactor refactor ServerURI 4 lyfe"Justin Clark-Casey (justincc)2010-10-221-1/+1
| * | | | | | | Revert "* additional serveruri cleanup"Justin Clark-Casey (justincc)2010-10-221-1/+1
| * | | | | | | 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-211-2/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | * additional serveruri cleanupJonathan Freedman2010-10-201-1/+1
| * | | | | | | * refactor refactor refactor ServerURI 4 lyfeJonathan Freedman2010-10-201-1/+1
| |/ / / / / /
* | | | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-181-3/+7
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | .NET automagical serialization of SOPs replaced by manual serialization acros...Diva Canto2010-10-171-3/+7
* | | | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-167-57/+122
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | 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
| * | | | | | Fix test break - TestSerializeXml2() still requires old-guids optionJustin Clark-Casey (justincc)2010-10-161-3/+6
| * | | | | | Made OARs use the new serialization procedure. (TPs/crossings still on the ol...Diva Canto2010-10-155-17/+28
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-062-10/+12
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Add and plumb the usetex URL parameter to worldview. Required but not yetMelanie2010-10-062-10/+12
* | | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-062-12/+40
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Convert the map image modules to new style modulesMelanie2010-10-062-12/+40
| | |_|_|/ | |/| | |
* | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-062-3/+18
|\ \ \ \ \ | |/ / / /
| * | | | Add the view generating method to the image generator interfaceMelanie2010-10-051-0/+5
| * | | | Revert an accidental default value changeMelanie2010-10-051-1/+1
| * | | | Patch to allow other cam angles. Not complete. Thanks, Antont.Melanie2010-10-051-4/+14
| | |_|/ | |/| |
| * | | Avoid throwing errors when adding existing meshes to the render sceneLatif Khalifa2010-10-041-0/+6
| | |/ | |/|
* | | Avoid throwing errors when adding existing meshes to the render sceneLatif Khalifa2010-10-041-0/+6
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-039-47/+1413
|\ \ \ | |/ /
| * | Adapt to core changesMelanie2010-10-031-1/+1
| * | Addign the new / renamed files for previous commitMelanie2010-10-038-0/+2655