aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-226-20/+58
|\
| * Allow OARs and IARs to save and load meshes.Justin Clark-Casey (justincc)2010-10-221-0/+2
| * print IAR version number on console when savingJustin Clark-Casey (justincc)2010-10-221-2/+6
| * Implement guard against trying to load incompatible version IARsJustin Clark-Casey (justincc)2010-10-222-3/+20
| * start parsing iar control fileJustin Clark-Casey (justincc)2010-10-223-2/+21
| * slightly simplify oar control file loading codeJustin Clark-Casey (justincc)2010-10-221-10/+3
| * write IAR control file first in the archive rather than lastJustin Clark-Casey (justincc)2010-10-222-5/+8
* | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-211-1/+1
|\ \ | |/
| * minor: add some text to the oar abort messages on assets timeout to make it c...Justin Clark-Casey (justincc)2010-10-221-1/+1
* | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-212-8/+71
|\ \ | |/
| * Allow region modules to know which agents actually receive chatJustin Clark-Casey (justincc)2010-10-222-8/+71
* | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-211-1/+6
|\ \ | |/
| * This fixes a delay in llSetLinkPrimitiveParamsFastAdelleF2010-10-211-1/+6
* | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-211-1/+1
|\ \ | |/
| * Deleted a verbose and unneeded log message.Diva Canto2010-10-211-1/+1
* | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-212-9/+3
|\ \ | |/
| * Make SImStatsReporter pick ObjectCapacity striaght out of region infoMelanie2010-10-212-9/+3
* | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-211-2/+0
|\ \ | |/
| * Remove a bit of dead code relating to ObjectCapacityMelanie2010-10-211-2/+0
* | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-211-1/+1
|\ \ | |/
| * Fix the OOB error (#5102). Sorry, my bad.Melanie2010-10-211-1/+1
* | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-211-0/+6
|\ \ | |/
| * Skip empty strings in ParseString* functionsMelanie2010-10-211-0/+6
* | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-201-3/+4
|\ \ | |/
| * Merge branch 'master' of ssh://MyConnection01/var/git/opensimdahlia2010-10-2021-166/+123
| |\
| * | fix combining of multiple physics submeshesdahlia2010-10-201-3/+4
* | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-2021-166/+123
|\ \ \ | | |/ | |/|
| * | * remove some spurious debug infoJonathan Freedman2010-10-203-20/+22
| * | * more url / hg cleanupJonathan Freedman2010-10-208-45/+56
| * | * additional serveruri cleanupJonathan Freedman2010-10-208-54/+20
| * | * refactor refactor refactor ServerURI 4 lyfeJonathan Freedman2010-10-2014-94/+72
| |/
* | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-193-4/+7
|\ \ | |/
| * Deleted verbose debug messages that are bringing sims to an halt. Increased t...Diva Canto2010-10-192-3/+3
| * * 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
* | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-191-17/+62
|\ \ | |/
| * * 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 /var/git/opensim/opensim mirror account2010-10-191-3/+3
|\ \ | |/
| * It looks like Vector3s also got written down in lower case at some point in t...Diva Canto2010-10-191-3/+3
* | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-191-13/+17
|\ \ | |/
| * Another take related to the previous commit.Diva Canto2010-10-191-13/+17
* | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-191-4/+15
|\ \ | |/
| * Added code to quaternion deserialization to try to cope with an exception see...Diva Canto2010-10-191-4/+15
* | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-191-0/+27
|\ \ | |/
| * Added TextureAnimation and ParticleSystem to serialization.Diva Canto2010-10-191-0/+27
* | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-181-48/+76
|\ \ | |/
| * * This concludes UploadObjectAsset for now until the permissions and physics ...Teravus Ovares (Dan Olivares)2010-10-191-48/+76
* | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-181-0/+301
|\ \ | |/
| * * Almost complete implementation of UploadObjectAsset cap. all meshes get u...Teravus Ovares (Dan Olivares)2010-10-181-0/+301
* | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-182-3/+4
|\ \ | |/
| * Add 'contributors' notice for zlib.net.dll to keep track of its origin and ve...Justin Clark-Casey (justincc)2010-10-191-0/+1