aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminster-presence-refactorMelanie2010-10-2114-75/+476
|\
| * Skip empty strings in ParseString* functionsMelanie2010-10-211-0/+6
| * Merge branch 'master' of ssh://MyConnection01/var/git/opensimdahlia2010-10-206-46/+21
| |\
| | * * remove some spurious debug infoJonathan Freedman2010-10-201-0/+2
| | * * more url / hg cleanupJonathan Freedman2010-10-202-26/+12
| | * * additional serveruri cleanupJonathan Freedman2010-10-203-5/+5
| | * * refactor refactor refactor ServerURI 4 lyfeJonathan Freedman2010-10-203-22/+9
| * | fix combining of multiple physics submeshesdahlia2010-10-201-3/+4
| |/
| * Deleted verbose debug messages that are bringing sims to an halt. Increased t...Diva Canto2010-10-191-2/+2
| * * One more goofy thing. I note that the sculpt texture id is broken out of t...Teravus Ovares (Dan Olivares)2010-10-201-1/+4
| * * This removes an ugly extraparams hack that I used and makes UploadObjectAss...Teravus Ovares (Dan Olivares)2010-10-201-17/+62
| * 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
| * * This concludes UploadObjectAsset for now until the permissions and physics ...Teravus Ovares (Dan Olivares)2010-10-191-48/+76
| * * Almost complete implementation of UploadObjectAsset cap. all meshes get u...Teravus Ovares (Dan Olivares)2010-10-181-0/+301
| * Stop the InventoryTransferModule logging every IM notification it receives, e...Justin Clark-Casey (justincc)2010-10-191-3/+3
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-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' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-10-197-165/+229
| |\ \ | | |/
| * | Pass in requesting agent ID when GetGroupMembers is called in the XMLRPC grou...Justin Clark-Casey (justincc)2010-10-192-3/+6
| * | Display more information when xmlrpcgroupsserver comms failsJustin Clark-Casey (justincc)2010-10-192-13/+14
* | | 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-187-159/+235
|\ \ \ | |/ /
| * | remove some cruft from last commitdahlia2010-10-181-8/+0
| * | initial support for meshies physics. Must set ini option UseMeshiesPhysicsMes...dahlia2010-10-181-43/+94
| * | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2010-10-173-0/+55
| |\ \
| | * | Adding osFunctions for light projectionBlueWall2010-10-173-0/+55
| | |/
| * | 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-173-62/+28
| |/
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-1611-180/+279
|\ \ | |/
| * 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-163-10/+13
| * change --old-guids switch on the save oar command line to --version=<x>Justin Clark-Casey (justincc)2010-10-166-11/+33
| * 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-1510-142/+188
* | Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca...Melanie2010-10-166-375/+799
|\ \
| * \ Merge branch 'master' into careminster-presence-refactorMelanie2010-10-166-375/+799
| |\ \ | | |/
| | * A couple of more ways attachment point is sentLatif Khalifa2010-10-151-0/+8
| | * one more silly line ending thing.... *If you have problems, fetch the tree an...Teravus Ovares (Dan Olivares)2010-10-151-71/+71
| | * more work in progress on mesh physics - still non-functionaldahlia2010-10-141-2/+67
| | * laying some groundwork for mesh physicsdahlia2010-10-141-70/+80
| | * Merge branch 'master' of ssh://MyConnection/var/git/opensimTeravus Ovares (Dan Olivares)2010-10-144-108/+171
| | |\
| | | * Don't distroy attachments when using viewer 2.1+, strip multiple attachment dataLatif Khalifa2010-10-141-0/+4