aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-202-19/+67
|\
| * 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
* | Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-201-0/+329
|\ \ | |/
| * * 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
* | Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-181-3/+3
|\ \ | |/
| * Stop the InventoryTransferModule logging every IM notification it receives, e...Justin Clark-Casey (justincc)2010-10-191-3/+3
* | Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-1710-60/+609
|\ \ | |/
| * .NET automagical serialization of SOPs replaced by manual serialization acros...Diva Canto2010-10-171-3/+7
| * 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
| * 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-155-17/+28
| * A couple of more ways attachment point is sentLatif Khalifa2010-10-151-0/+8
| * Merge branch 'master' of ssh://MyConnection/var/git/opensimTeravus Ovares (Dan Olivares)2010-10-142-3/+7
| |\
| | * Don't distroy attachments when using viewer 2.1+, strip multiple attachment dataLatif Khalifa2010-10-141-0/+4
| | * Kill some magic numbers in the mesh upload module and change the mesh assetMelanie2010-10-141-3/+3
| * | * Replacing Magic numbers with EnumsTeravus Ovares (Dan Olivares)2010-10-142-4/+4
| |/
| * * A few additional cleanup elementsTeravus Ovares (Dan Olivares)2010-10-142-0/+6
| * * Whoops, That was supposed to use the HTTP VERB 'GET' not 'POST'Teravus Ovares (Dan Olivares)2010-10-141-1/+1
| * * Tweaked the upload response and now at least uploading the mesh works.Teravus Ovares (Dan Olivares)2010-10-142-16/+21
| * Rename file + more testing and tweakingTeravus Ovares (Dan Olivares)2010-10-141-9/+17
| * * Partially complete stuff for Mesh support that Melanie wanted to see before...Teravus Ovares (Dan Olivares)2010-10-142-0/+449
* | * more url / hg cleanupJonathan Freedman2010-10-112-26/+12
* | Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-102-3/+14
|\ \ | |/
| * Fix a typo in previouis commit: start must not pass the end of the fileLatif Khalifa2010-10-091-2/+2
| * weird line endings fix commitTeravus Ovares (Dan Olivares)2010-10-091-7/+7
| * Return error code instead of the last byte of the file if range is not satisf...Latif Khalifa2010-10-091-1/+9
| * In case when 1 single byte is requested (yes viewer does this)Latif Khalifa2010-10-091-2/+2
| * Fix an infinite recursionMelanie2010-10-081-1/+4
* | Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-074-27/+80
|\ \ | |/
| * Plumb the path for multiple object deletesMelanie2010-10-061-5/+26
| * Add and plumb the usetex URL parameter to worldview. Required but not yetMelanie2010-10-062-10/+12
| * Fix incorrect class nameMelanie2010-10-061-1/+1
| * Convert the map image modules to new style modulesMelanie2010-10-063-12/+42
* | Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-052-3/+18
|\ \ | |/
| * Add the view generating method to the image generator interfaceMelanie2010-10-051-0/+5
| * Revert an accidental default value changeMelanie2010-10-051-1/+1
| * Patch to allow other cam angles. Not complete. Thanks, Antont.Melanie2010-10-051-4/+14
* | Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-057-16/+35
|\ \ | |/
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-10-052-7/+7
| |\
| | * Formatting cleanup.Jeff Ames2010-10-042-7/+7
| * | Make windlight set the default environment on startBlueWall2010-10-051-0/+1
| |/
| * Avoid throwing errors when adding existing meshes to the render sceneLatif Khalifa2010-10-041-0/+6
| * Added viewer's channel, mac, and id0 to agent circuit data. Also moved client...Diva Canto2010-10-031-5/+17