aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into mantis5110Jonathan Freedman2010-10-257-12/+13
|\
| * * Updated libomv to r3461Latif Khalifa2010-10-247-12/+13
* | Merge branch 'master' into mantis5110Jonathan Freedman2010-10-243-3/+46
|\ \ | |/
| * Add PRIM_NAME, PRIM_DESC and PRIM_ROT_LOCALMelanie2010-10-242-0/+30
| * Added inner exception handling in Shape deserialization processing, so that t...Diva Canto2010-10-231-3/+16
* | Merge branch 'master' into mantis5110Jonathan Freedman2010-10-240-0/+0
|\ \ | |/
| * 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-2225-214/+193
* | | Merge branch 'master' into mantis5110Jonathan Freedman2010-10-243-5/+5
|\ \ \ | | |/ | |/|
| * | Change some exception to use ToString(). e.Message is not sufficient to fixMelanie2010-10-221-3/+3
| |/
| * Merge remote branch 'otakup0pe/mantis5110'Justin Clark-Casey (justincc)2010-10-2225-193/+214
| |\
| * | Revert "* refactor refactor refactor ServerURI 4 lyfe"Justin Clark-Casey (justincc)2010-10-2214-72/+94
| * | Revert "* additional serveruri cleanup"Justin Clark-Casey (justincc)2010-10-228-20/+54
| * | Revert "* more url / hg cleanup"Justin Clark-Casey (justincc)2010-10-228-56/+45
| * | Revert "* remove some spurious debug info"Justin Clark-Casey (justincc)2010-10-223-22/+20
| * | Fix llParcelMediaCommandList() so that it applies commands only to the parcel...Justin Clark-Casey (justincc)2010-10-221-4/+4
| * | 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
| * | 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
| * | Allow region modules to know which agents actually receive chatJustin Clark-Casey (justincc)2010-10-222-8/+71
| * | This fixes a delay in llSetLinkPrimitiveParamsFastAdelleF2010-10-211-1/+6
| * | Deleted a verbose and unneeded log message.Diva Canto2010-10-211-1/+1
| * | Make SImStatsReporter pick ObjectCapacity striaght out of region infoMelanie2010-10-212-9/+3
| * | Remove a bit of dead code relating to ObjectCapacityMelanie2010-10-211-2/+0
| * | Fix the OOB error (#5102). Sorry, my bad.Melanie2010-10-211-1/+1
| * | Skip empty strings in ParseString* functionsMelanie2010-10-211-0/+6
| * | Merge branch 'master' of ssh://MyConnection01/var/git/opensimdahlia2010-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
* | | | * throw debug message when no HomeURI is setJonathan Freedman2010-10-241-0/+2
* | | | * a bit of additional debugging:Jonathan Freedman2010-10-232-8/+6
| |_|/ |/| |
* | | Merge branch 'hg16' into mantis5110Jonathan Freedman2010-10-2225-193/+214
|\ \ \
| * | | * change the data exchanged within hypergrid transactionsJonathan Freedman2010-10-2110-44/+108
| * | | Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-203-20/+68
| |\ \ \ | | | |/ | | |/|
| * | | * remove some spurious debug infoJonathan Freedman2010-10-203-20/+22
| * | | Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-202-8/+379
| |\ \ \
| * \ \ \ Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-1813-67/+123
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-1740-28231/+30424
| |\ \ \ \ \
| * | | | | | * more url / hg cleanupJonathan Freedman2010-10-118-45/+56
| * | | | | | Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-108-32/+55
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-0716-72/+382
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-0518-30083/+0
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-053-3/+20
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-0545-27668/+28159
| |\ \ \ \ \ \ \ \ \ \