aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminster-presence-refactorMelanie2010-10-232-2/+35
|\
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-10-221-3/+3
| |\
| | * Change some exception to use ToString(). e.Message is not sufficient to fixMelanie2010-10-221-3/+3
| * | Revert "Merge remote branch 'otakup0pe/mantis5110'"Justin Clark-Casey (justincc)2010-10-222-7/+2
| |/
| * Merge branch 'hg16' into mantis5110Jonathan Freedman2010-10-222-2/+7
| |\
| | * * change the data exchanged within hypergrid transactionsJonathan Freedman2010-10-212-2/+5
| | * * remove some spurious debug infoJonathan Freedman2010-10-201-0/+2
| * | Allow region modules to know which agents actually receive chatJustin Clark-Casey (justincc)2010-10-221-0/+35
| * | Make SImStatsReporter pick ObjectCapacity striaght out of region infoMelanie2010-10-222-9/+3
| |/
* | Change some exception to use ToString(). e.Message is not sufficient to fixMelanie2010-10-221-3/+3
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-212-9/+3
|\ \
| * | Make SImStatsReporter pick ObjectCapacity striaght out of region infoMelanie2010-10-212-9/+3
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-212-8/+52
|\ \ \ | |/ /
| * | * remove some spurious debug infoJonathan Freedman2010-10-201-0/+2
| |/
| * It looks like Vector3s also got written down in lower case at some point in t...Diva Canto2010-10-191-3/+3
| * Another take related to the previous commit.Diva Canto2010-10-191-13/+17
| * Added code to quaternion deserialization to try to cope with an exception see...Diva Canto2010-10-191-4/+15
| * Added TextureAnimation and ParticleSystem to serialization.Diva Canto2010-10-191-0/+27
| * COmmented the wrong line instead, now I commented them all to be on the safe ...Melanie2010-10-191-2/+2
* | COmmented the wrong line instead, now I commented them all to be on the safe ...Melanie2010-10-191-2/+2
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-191-1/+1
|\ \ | |/
| * Comment a spammy debug message in the serializerMelanie2010-10-191-1/+1
* | Fix merge issuesMelanie2010-10-181-12/+0
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-182-112/+86
|\ \ | |/
| * Deleted all [XmlIgnore] from SOP, since those are meaningless now.Diva Canto2010-10-172-58/+58
| * .NET automagical serialization of SOPs replaced by manual serialization acros...Diva Canto2010-10-172-59/+21
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-164-123/+157
|\ \ | |/
| * Made OARs use the new serialization procedure. (TPs/crossings still on the ol...Diva Canto2010-10-154-123/+157
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-162-309/+178
|\ \ | |/
| * Added manual xml2 serialization. Rewired only save xml2, not oars yet. Seems ...Diva Canto2010-10-142-105/+164
| * Added SOP.MediaUrl and Shape.Media to the deserializationDiva Canto2010-10-131-204/+14
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-132-7/+1381
|\ \ | |/
| * Comment a debug message so that it doesn't spew the console upon encountering...Diva Canto2010-10-131-1/+1
| * New SOG/SOP parser using XmlTextReader + delegates dictionary. Active for loa...Diva Canto2010-10-132-7/+1381
| * Change the part for sound playback to be the root part / object UUID insteadMelanie2010-10-101-8/+8
* | change default next owner persm to mod/trans to match SL.Melanie2010-10-131-1/+4
* | Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/va...Melanie2010-10-101-14/+14
|\ \
| * | Add group invites to the list of messages that get offlinedMelanie2010-10-101-14/+14
* | | Change the part for sound playback to be the root part / object UUID insteadMelanie2010-10-101-8/+8
|/ /
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-091-3/+5
|\ \ | |/
| * Guard against locking a nullref to avoid build breakMelanie2010-10-081-0/+3
| * Change the order of actions to address a possible nullrefMelanie2010-10-081-3/+2
| * Fix autoreturn to not return zero objectsMelanie2010-10-071-6/+2
| * Plumb the path for multiple object deletesMelanie2010-10-064-40/+18
* | Fix a security relevant issue with take / take copyMelanie2010-10-091-48/+62
* | Make SendKillObject send multiple localIDs in one packet. This avoids theMelanie2010-10-085-22/+29
* | Implement taking of coalesced objects.Melanie2010-10-073-7/+13
* | Plumb the path for multiple object deletesMelanie2010-10-064-40/+18
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-061-1/+1
|\ \ | |/
| * Add and plumb the usetex URL parameter to worldview. Required but not yetMelanie2010-10-061-1/+1