Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | | Intermediate commit for backward compatability; does not compile yet | Mic Bowman | 2010-10-25 | 2 | -62/+73 | |
| | * | | | First attempt to get multiple attachments working to support viewer2. | Master ScienceSim | 2010-10-21 | 6 | -111/+100 | |
* | | | | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-29 | 3 | -1/+133 | |
|\ \ \ \ \ | |/ / / / | ||||||
| * | | | | Add my work on top of cmickeyb's | Melanie | 2010-10-29 | 3 | -1/+133 | |
* | | | | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-29 | 31 | -766/+967 | |
|\ \ \ \ \ | |/ / / / | ||||||
| * | | | | Merge branch 'dev-appearance' | Melanie | 2010-10-29 | 28 | -779/+954 | |
| |\ \ \ \ | ||||||
| | * \ \ \ | Merge branch 'dev-appearance' of git://github.com/cmickeyb/opensim into dev-a... | Melanie | 2010-10-21 | 28 | -780/+956 | |
| | |\ \ \ \ | | | |/ / / | ||||||
| | | * | | | Major refactoring of appearance handling. | Master ScienceSim | 2010-10-20 | 28 | -779/+955 | |
| * | | | | | Revert "Preliminary work on appearance layers. No user functionality yet." | Melanie | 2010-10-29 | 4 | -235/+261 | |
* | | | | | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-29 | 4 | -261/+235 | |
|\ \ \ \ \ \ | |/ / / / / | ||||||
| * | | | | | Preliminary work on appearance layers. No user functionality yet. | Melanie | 2010-10-29 | 4 | -261/+235 | |
| | |_|_|/ | |/| | | | ||||||
* | | | | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-28 | 2 | -20/+28 | |
|\ \ \ \ \ | |/ / / / | ||||||
| * | | | | HypergridLinker optimizations and enable use of owner_uuid/EstateOwner with l... | Marck | 2010-10-28 | 2 | -20/+28 | |
| | |_|/ | |/| | | ||||||
* | | | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-27 | 2 | -2/+1 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | Formatting cleanup. | Jeff Ames | 2010-10-28 | 2 | -2/+1 | |
* | | | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-27 | 1 | -1/+4 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | Prevent nullrefs in scene object deletion. Mantis #5156 | Melanie | 2010-10-27 | 1 | -1/+4 | |
* | | | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-26 | 1 | -9/+27 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | Merge branch 'master' of ssh://MyConnection01/var/git/opensim | dahlia | 2010-10-26 | 9 | -63/+37 | |
| |\ \ \ | ||||||
| * | | | | Overload Scene.NewUserConnection() to facilitate NPCs and other region specif... | dahlia | 2010-10-26 | 1 | -9/+27 | |
* | | | | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-26 | 9 | -63/+37 | |
|\ \ \ \ \ | | |/ / / | |/| | | | ||||||
| * | | | | Formatting cleanup. | Jeff Ames | 2010-10-27 | 9 | -63/+37 | |
| |/ / / | ||||||
* | | | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-24 | 7 | -12/+13 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | * Updated libomv to r3461 | Latif Khalifa | 2010-10-24 | 7 | -12/+13 | |
* | | | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-24 | 2 | -0/+30 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | Add PRIM_NAME, PRIM_DESC and PRIM_ROT_LOCAL | Melanie | 2010-10-24 | 2 | -0/+30 | |
* | | | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-23 | 1 | -3/+16 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | Added inner exception handling in Shape deserialization processing, so that t... | Diva Canto | 2010-10-23 | 1 | -3/+16 | |
* | | | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-22 | 25 | -214/+193 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-10-22 | 1 | -3/+3 | |
| |\ \ \ | ||||||
| * | | | | Revert "Merge remote branch 'otakup0pe/mantis5110'" | Justin Clark-Casey (justincc) | 2010-10-22 | 25 | -214/+193 | |
* | | | | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-22 | 1 | -3/+3 | |
|\ \ \ \ \ | | |/ / / | |/| | | | ||||||
| * | | | | Change some exception to use ToString(). e.Message is not sufficient to fix | Melanie | 2010-10-22 | 1 | -3/+3 | |
| |/ / / | ||||||
* | | | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-22 | 10 | -44/+108 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | Merge remote branch 'otakup0pe/mantis5110' | Justin Clark-Casey (justincc) | 2010-10-22 | 25 | -193/+214 | |
| |\ \ \ | ||||||
| | * \ \ | Merge branch 'hg16' into mantis5110 | Jonathan Freedman | 2010-10-22 | 25 | -193/+214 | |
| | |\ \ \ | ||||||
| | | * | | | * change the data exchanged within hypergrid transactions | Jonathan Freedman | 2010-10-21 | 10 | -44/+108 | |
| | | * | | | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-20 | 3 | -20/+68 | |
| | | |\ \ \ | ||||||
| | | * | | | | * remove some spurious debug info | Jonathan Freedman | 2010-10-20 | 3 | -20/+22 | |
| | | * | | | | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-20 | 2 | -8/+379 | |
| | | |\ \ \ \ | ||||||
| | | * \ \ \ \ | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-18 | 13 | -67/+123 | |
| | | |\ \ \ \ \ | ||||||
| | | * \ \ \ \ \ | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-17 | 40 | -28231/+30424 | |
| | | |\ \ \ \ \ \ | ||||||
| | | * | | | | | | | * more url / hg cleanup | Jonathan Freedman | 2010-10-11 | 8 | -45/+56 | |
| | | * | | | | | | | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-10 | 8 | -32/+55 | |
| | | |\ \ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ \ \ | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-07 | 16 | -72/+382 | |
| | | |\ \ \ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ \ \ \ | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-05 | 18 | -30083/+0 | |
| | | |\ \ \ \ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ \ \ \ \ | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-05 | 3 | -3/+20 | |
| | | |\ \ \ \ \ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-05 | 45 | -27668/+28159 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-03 | 20 | -71/+1506 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | * additional serveruri cleanup | Jonathan Freedman | 2010-10-03 | 8 | -54/+20 |