aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into mantis5110Jonathan Freedman2010-10-291-10/+16
|\
| * tweak a few more scene presence logging messages for consistencyJustin Clark-Casey (justincc)2010-10-291-3/+3
| * Rationalize the logging messages from the merged appearance branch, commentin...Justin Clark-Casey (justincc)2010-10-291-5/+5
| * Merge branch 'justincc-dev'Justin Clark-Casey (justincc)2010-10-291-3/+9
| |\
| | * add timing report to CompleteScenePresence for diagnostic purposesJustin Clark-Casey (justincc)2010-10-291-1/+8
* | | Merge branch 'master' into mantis5110Jonathan Freedman2010-10-293-20/+92
|\ \ \ | |/ /
| * | Merge commit 'cmickeyb/dev-appearance'Melanie2010-10-293-23/+96
| |\ \
| | * | Clean up some cruft from the last commit. Re-add the initial updateMaster ScienceSim2010-10-292-2/+41
| | * | Bunch of fixes that reduce the number of times appearanceMaster ScienceSim2010-10-292-20/+53
| * | | 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
| | |\ \
| | * | | Make SImStatsReporter pick ObjectCapacity striaght out of region infoMelanie2010-10-212-9/+3
| | * | | * remove some spurious debug infoJonathan Freedman2010-10-201-0/+2
* | | | | Merge branch 'master' into mantis5110Jonathan Freedman2010-10-296-177/+86
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge branch 'opensim-master' into dev-appearanceMaster ScienceSim2010-10-285-25/+88
| |\ \ \ \ | | |/ / /
| | * | | 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
| | |/ / /
| * | | | First attempt to get multiple attachments working to support viewer2.Master ScienceSim2010-10-211-4/+5
| | |_|/ | |/| |
| * | | Major refactoring of appearance handling.Master ScienceSim2010-10-203-159/+49
| | |/ | |/|
* | | Merge branch 'master' into mantis5110Jonathan Freedman2010-10-241-3/+16
|\ \ \ | | |/ | |/|
| * | Added inner exception handling in Shape deserialization processing, so that t...Diva Canto2010-10-231-3/+16
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-10-221-3/+3
| |\ \ | |/ / |/| |
| * | Revert "Merge remote branch 'otakup0pe/mantis5110'"Justin Clark-Casey (justincc)2010-10-222-7/+2
* | | Change some exception to use ToString(). e.Message is not sufficient to fixMelanie2010-10-221-3/+3
|/ /
* | 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
|/
* 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
* Comment a spammy debug message in the serializerMelanie2010-10-191-1/+1
* 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
* Made OARs use the new serialization procedure. (TPs/crossings still on the ol...Diva Canto2010-10-154-123/+157
* 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
* 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
* 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
* Add and plumb the usetex URL parameter to worldview. Required but not yetMelanie2010-10-061-1/+1