| Commit message (Expand) | Author | Age | Files | Lines |
* | Rationalize the logging messages from the merged appearance branch, commentin... | Justin Clark-Casey (justincc) | 2010-10-29 | 4 | -57/+39 |
* | Merge branch 'justincc-dev' | Justin Clark-Casey (justincc) | 2010-10-29 | 6 | -11/+23 |
|\ |
|
| * | add timing report to CompleteScenePresence for diagnostic purposes | Justin Clark-Casey (justincc) | 2010-10-29 | 1 | -1/+8 |
| * | for now, comment out some older or redundant log debug lines to make diagnost... | Justin Clark-Casey (justincc) | 2010-10-29 | 4 | -6/+6 |
| * | Add number of ms it takes to complete UseCircuitCode packet handling to log f... | Justin Clark-Casey (justincc) | 2010-10-29 | 1 | -2/+8 |
* | | Merge commit 'cmickeyb/dev-appearance' | Melanie | 2010-10-29 | 13 | -303/+553 |
|\ \ |
|
| * | | Clean up some cruft from the last commit. Re-add the initial update | Master ScienceSim | 2010-10-29 | 2 | -2/+41 |
| * | | Bunch of fixes that reduce the number of times appearance | Master ScienceSim | 2010-10-29 | 5 | -81/+132 |
| * | | Configuration of persistent baked textures and save/send delays. | Master ScienceSim | 2010-10-28 | 2 | -5/+27 |
| * | | Merge branch 'opensim-master' into dev-appearance | Master ScienceSim | 2010-10-28 | 21 | -120/+261 |
| |\ \ |
|
| * | | | Added background thread to handle delayed send and save of appearance | Master ScienceSim | 2010-10-28 | 2 | -59/+171 |
| * | | | Small cleanup and add more debugging information | Master ScienceSim | 2010-10-26 | 2 | -8/+23 |
| * | | | Made the check for texture assets asynchronous. This is one part of | Master ScienceSim | 2010-10-26 | 1 | -7/+10 |
| * | | | Half of the compatibility is working. Login into a new region with | Master ScienceSim | 2010-10-25 | 4 | -21/+29 |
| * | | | 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 |
* | | | | Add my work on top of cmickeyb's | Melanie | 2010-10-29 | 1 | -1/+99 |
* | | | | 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 | 2 | -201/+261 |
* | | | | | Preliminary work on appearance layers. No user functionality yet. | Melanie | 2010-10-29 | 2 | -261/+201 |
| |_|_|/
|/| | | |
|
* | | | | HypergridLinker optimizations and enable use of owner_uuid/EstateOwner with l... | Marck | 2010-10-28 | 1 | -20/+27 |
| |_|/
|/| | |
|
* | | | Formatting cleanup. | Jeff Ames | 2010-10-28 | 2 | -2/+1 |
* | | | Prevent nullrefs in scene object deletion. Mantis #5156 | Melanie | 2010-10-27 | 1 | -1/+4 |
* | | | Merge branch 'master' of ssh://MyConnection01/var/git/opensim | dahlia | 2010-10-26 | 9 | -63/+37 |
|\ \ \ |
|
| * | | | Formatting cleanup. | Jeff Ames | 2010-10-27 | 9 | -63/+37 |
* | | | | Overload Scene.NewUserConnection() to facilitate NPCs and other region specif... | dahlia | 2010-10-26 | 1 | -9/+27 |
|/ / / |
|
* | | | * Updated libomv to r3461 | Latif Khalifa | 2010-10-24 | 1 | -2/+2 |
* | | | Add PRIM_NAME, PRIM_DESC and PRIM_ROT_LOCAL | Melanie | 2010-10-24 | 2 | -0/+30 |
* | | | Added inner exception handling in Shape deserialization processing, so that t... | Diva Canto | 2010-10-23 | 1 | -3/+16 |
* | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 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 |
* | | | | Revert "Merge remote branch 'otakup0pe/mantis5110'" | Justin Clark-Casey (justincc) | 2010-10-22 | 25 | -214/+193 |
|/ / / |
|
* | | | 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 | 9 | -66/+115 |
| | |\ \ \ \ |
|
| | * \ \ \ \ | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-17 | 27 | -331/+2400 |
| | |\ \ \ \ \ |
|
| | * | | | | | | * 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 | 7 | -32/+49 |
| | |\ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-07 | 14 | -70/+369 |
| | |\ \ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ \ | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-05 | 17 | -30051/+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 | 28 | -70/+213 |
| | |\ \ \ \ \ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-03 | 14 | -71/+1462 |
| | |\ \ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | | | * additional serveruri cleanup | Jonathan Freedman | 2010-10-03 | 8 | -54/+20 |