aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | Merge branch 'dev-appearance'Melanie2010-10-293-159/+48
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Merge branch 'dev-appearance' of git://github.com/cmickeyb/opensim into dev-a...Melanie2010-10-213-160/+50
| | |\ \ \ \ | | | |/ / /
| | | * | | Major refactoring of appearance handling.Master ScienceSim2010-10-203-159/+49
* | | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-274-14/+35
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Prevent nullrefs in scene object deletion. Mantis #5156Melanie2010-10-271-1/+4
| * | | | | Merge branch 'master' of ssh://MyConnection01/var/git/opensimdahlia2010-10-262-4/+4
| |\ \ \ \ \
| | * | | | | Formatting cleanup.Jeff Ames2010-10-272-4/+4
| | | |_|_|/ | | |/| | |
| * | | | | Overload Scene.NewUserConnection() to facilitate NPCs and other region specif...dahlia2010-10-261-9/+27
| |/ / / /
* | | | | Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/va...Melanie2010-10-251-16/+22
|\ \ \ \ \
| * | | | | Comment repeated add and remove of avatars from the physical scene. It's noMelanie2010-10-251-16/+22
* | | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-251-3/+16
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / /
| * | | | Added inner exception handling in Shape deserialization processing, so that t...Diva Canto2010-10-231-3/+16
* | | | | Change the results from llGetPrimitiveParams to be the same as SL forMelanie2010-10-241-1/+1
* | | | | 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
|\ \