aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | Made the check for texture assets asynchronous. This is one part ofMaster ScienceSim2010-10-261-7/+10
| | * | | Half of the compatibility is working. Login into a new region withMaster ScienceSim2010-10-254-21/+29
| | * | | Intermediate commit for backward compatability; does not compile yetMic Bowman2010-10-252-62/+73
| | * | | First attempt to get multiple attachments working to support viewer2.Master ScienceSim2010-10-216-111/+100
* | | | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-293-1/+133
|\ \ \ \ \ | |/ / / /
| * | | | Add my work on top of cmickeyb'sMelanie2010-10-293-1/+133
* | | | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-2931-766/+967
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'dev-appearance'Melanie2010-10-2928-779/+954
| |\ \ \ \
| | * \ \ \ Merge branch 'dev-appearance' of git://github.com/cmickeyb/opensim into dev-a...Melanie2010-10-2128-780/+956
| | |\ \ \ \ | | | |/ / /
| | | * | | Major refactoring of appearance handling.Master ScienceSim2010-10-2028-779/+955
| * | | | | Revert "Preliminary work on appearance layers. No user functionality yet."Melanie2010-10-294-235/+261
* | | | | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-294-261/+235
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Preliminary work on appearance layers. No user functionality yet.Melanie2010-10-294-261/+235
| | |_|_|/ | |/| | |
* | | | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-282-20/+28
|\ \ \ \ \ | |/ / / /
| * | | | HypergridLinker optimizations and enable use of owner_uuid/EstateOwner with l...Marck2010-10-282-20/+28
| | |_|/ | |/| |
* | | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-272-2/+1
|\ \ \ \ | |/ / /
| * | | Formatting cleanup.Jeff Ames2010-10-282-2/+1
* | | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-271-1/+4
|\ \ \ \ | |/ / /
| * | | Prevent nullrefs in scene object deletion. Mantis #5156Melanie2010-10-271-1/+4
* | | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-261-9/+27
|\ \ \ \ | |/ / /
| * | | Merge branch 'master' of ssh://MyConnection01/var/git/opensimdahlia2010-10-269-63/+37
| |\ \ \
| * | | | Overload Scene.NewUserConnection() to facilitate NPCs and other region specif...dahlia2010-10-261-9/+27
* | | | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-269-63/+37
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Formatting cleanup.Jeff Ames2010-10-279-63/+37
| |/ / /
* | | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-247-12/+13
|\ \ \ \ | |/ / /
| * | | * Updated libomv to r3461Latif Khalifa2010-10-247-12/+13
* | | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-242-0/+30
|\ \ \ \ | |/ / /
| * | | Add PRIM_NAME, PRIM_DESC and PRIM_ROT_LOCALMelanie2010-10-242-0/+30
* | | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-231-3/+16
|\ \ \ \ | |/ / /
| * | | Added inner exception handling in Shape deserialization processing, so that t...Diva Canto2010-10-231-3/+16
* | | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-2225-214/+193
|\ \ \ \ | |/ / /
| * | | 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' of /var/git/opensim/opensim mirror account2010-10-221-3/+3
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Change some exception to use ToString(). e.Message is not sufficient to fixMelanie2010-10-221-3/+3
| |/ / /
* | | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-2210-44/+108
|\ \ \ \ | |/ / /
| * | | Merge remote branch 'otakup0pe/mantis5110'Justin Clark-Casey (justincc)2010-10-2225-193/+214
| |\ \ \
| | * \ \ 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
| | | |\ \ \ \ \ \ \ \ \ \ \