| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-10-30 | 1 | -1/+1 |
|\ |
|
| * | Set async_packet_handling = true by default | Justin Clark-Casey (justincc) | 2010-10-30 | 1 | -1/+1 |
* | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-10-30 | 7 | -51/+53 |
|\ \
| |/ |
|
| * | Change level of some logging messages, turning some info into arguably more a... | Justin Clark-Casey (justincc) | 2010-10-30 | 1 | -5/+6 |
| * | tweak a few more scene presence logging messages for consistency | Justin Clark-Casey (justincc) | 2010-10-29 | 1 | -3/+3 |
| * | Rationalize the logging messages from the merged appearance branch, commentin... | Justin Clark-Casey (justincc) | 2010-10-29 | 2 | -34/+23 |
| * | Merge branch 'justincc-dev' | Justin Clark-Casey (justincc) | 2010-10-29 | 5 | -10/+22 |
| |\ |
|
| | * | 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 | 3 | -5/+5 |
| | * | Add number of ms it takes to complete UseCircuitCode packet handling to log f... | Justin Clark-Casey (justincc) | 2010-10-29 | 1 | -2/+8 |
* | | | READ CAREFULLY!!! This is a BROKEN commit. It is UNTESTED and INCOMPLETE. | Melanie | 2010-10-30 | 2 | -16/+20 |
|/ / |
|
* | | Merge commit 'cmickeyb/dev-appearance' | Melanie | 2010-10-29 | 6 | -116/+327 |
|\ \ |
|
| * | | 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 | 4 | -63/+115 |
| * | | Configuration of persistent baked textures and save/send delays. | Master ScienceSim | 2010-10-28 | 1 | -4/+14 |
| * | | Merge branch 'opensim-master' into dev-appearance | Master ScienceSim | 2010-10-28 | 20 | -120/+259 |
| |\ \
| | |/ |
|
| * | | Added background thread to handle delayed send and save of appearance | Master ScienceSim | 2010-10-28 | 1 | -55/+164 |
| * | | 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 | 1 | -1/+1 |
| * | | First attempt to get multiple attachments working to support viewer2. | Master ScienceSim | 2010-10-21 | 2 | -13/+11 |
* | | | Merge branch 'dev-appearance' | Melanie | 2010-10-29 | 11 | -270/+233 |
|\ \ \ |
|
| * \ \ | Merge branch 'dev-appearance' of git://github.com/cmickeyb/opensim into dev-a... | Melanie | 2010-10-21 | 11 | -271/+235 |
| |\ \ \
| | |/ / |
|
| | * | | Major refactoring of appearance handling. | Master ScienceSim | 2010-10-20 | 11 | -270/+234 |
* | | | | Revert "Preliminary work on appearance layers. No user functionality yet." | Melanie | 2010-10-29 | 1 | -8/+3 |
* | | | | Preliminary work on appearance layers. No user functionality yet. | Melanie | 2010-10-29 | 1 | -3/+8 |
| |_|/
|/| | |
|
* | | | 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 | 9 | -35/+54 |
|/ / / |
|
* | | | Merge remote branch 'otakup0pe/mantis5110' | Justin Clark-Casey (justincc) | 2010-10-22 | 9 | -54/+35 |
|\ \ \ |
|
| * \ \ | Merge branch 'hg16' into mantis5110 | Jonathan Freedman | 2010-10-22 | 9 | -54/+35 |
| |\ \ \ |
|
| | * | | | * change the data exchanged within hypergrid transactions | Jonathan Freedman | 2010-10-21 | 5 | -8/+14 |
| | * | | | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-20 | 2 | -19/+67 |
| | |\ \ \
| | | | |/
| | | |/| |
|
| | * | | | * remove some spurious debug info | Jonathan Freedman | 2010-10-20 | 1 | -0/+2 |
| | * | | | 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 | 6 | -64/+111 |
| | |\ \ \ \ |
|
| | * \ \ \ \ | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-17 | 19 | -322/+2240 |
| | |\ \ \ \ \ |
|
| | * | | | | | | * more url / hg cleanup | Jonathan Freedman | 2010-10-11 | 2 | -26/+12 |
| | * | | | | | | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-10 | 5 | -15/+28 |
| | |\ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-07 | 13 | -69/+368 |
| | |\ \ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ \ | 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 | 14 | -43/+76 |
| | |\ \ \ \ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ \ \ \ | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-03 | 12 | -70/+1450 |
| | |\ \ \ \ \ \ \ \ \ \ |
|