Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-29 | 1 | -3/+3 |
|\ | |||||
| * | tweak a few more scene presence logging messages for consistency | Justin Clark-Casey (justincc) | 2010-10-29 | 1 | -3/+3 |
* | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-29 | 4 | -57/+39 |
|\ \ | |/ | |||||
| * | Rationalize the logging messages from the merged appearance branch, commentin... | Justin Clark-Casey (justincc) | 2010-10-29 | 4 | -57/+39 |
* | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-29 | 6 | -11/+23 |
|\ \ | |/ | |||||
| * | 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 branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-29 | 2 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | Rename the new default texture to be consistent with the others | Melanie | 2010-10-29 | 2 | -1/+1 |
| * | | Add a default alpha layer | Melanie | 2010-10-29 | 1 | -0/+0 |
* | | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-29 | 14 | -303/+567 |
|\ \ \ | |/ / | |||||
| * | | Merge commit 'cmickeyb/dev-appearance' | Melanie | 2010-10-29 | 14 | -303/+567 |
| |\ \ | |||||
| | * | | 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 | 3 | -5/+41 |
| | * | | Merge branch 'opensim-master' into dev-appearance | Master ScienceSim | 2010-10-28 | 28 | -130/+273 |
| | |\ \ | |||||
| | * | | | 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 |
* | | | | | 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 |