aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/World (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminster-presence-refactorMelanie2010-11-161-1/+0
|\
| * Remove a debug spamMelanie2010-11-101-1/+0
| * Although the Allow Voice setting is per estate rather than per region,Melanie2010-11-091-1/+3
| * Fix parcel bans to work only on the avatars they're supposed to work on inste...Melanie2010-11-091-14/+15
| * Fix playing sound from HUDsMelanie2010-11-051-2/+16
| * Fix attached sounds from HUDs erroneously being delivered to other avatarsMelanie2010-11-051-0/+19
* | Although the Allow Voice setting is per estate rather than per region,Melanie2010-11-091-1/+3
* | Fix parcel bans to work only on the avatars they're supposed to work on inste...Melanie2010-11-091-14/+15
* | Decrease min search length to 2 chars for map search.Melanie2010-11-071-2/+2
* | Fix playing sound from HUDsMelanie2010-11-031-2/+16
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-11-024-18/+12
|\ \ | |/
| * Old deserialization can't deal with commas in flag fields. Making use of -ver...Diva Canto2010-11-022-16/+10
| * * AbsolutePosition.Get{} returns incorrect result for child prim so switch to...Teravus Ovares (Dan Olivares)2010-10-301-1/+1
| * for now, comment out some older or redundant log debug lines to make diagnost...Justin Clark-Casey (justincc)2010-10-291-1/+1
* | Fix attached sounds from HUDs erroneously being delivered to other avatarsMelanie2010-10-281-0/+19
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-272-43/+20
|\ \ | |/
| * Formatting cleanup.Jeff Ames2010-10-272-43/+20
* | 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