Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | * Thank you lkalif for fixing the {array[array[]]} json OSD serialization issue. | Teravus Ovares (Dan Olivares) | 2010-10-30 | 7 | -17065/+17065 |
* | Logins work now, but avatars are green ugly gnomes. | Melanie | 2010-10-30 | 1 | -2/+0 |
* | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-10-30 | 3 | -25/+5 |
|\ | |||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-10-30 | 11 | -423/+282 |
| |\ | |||||
| * | | minor: remove some old commented out code | Justin Clark-Casey (justincc) | 2010-10-30 | 1 | -22/+0 |
| * | | Clarify comment for configuration option Check4096 and show the default value. | Marck | 2010-10-30 | 2 | -3/+5 |
* | | | This commit fixes all the appearance related null refs. Still can't log in, | Melanie | 2010-10-30 | 4 | -59/+80 |
| |/ |/| | |||||
* | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-10-30 | 2 | -2/+3 |
|\ \ | |/ | |||||
| * | Set async_packet_handling = true by default | Justin Clark-Casey (justincc) | 2010-10-30 | 2 | -2/+3 |
* | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-10-30 | 11 | -103/+98 |
|\ \ | |/ | |||||
| * | Change level of some logging messages, turning some info into arguably more a... | Justin Clark-Casey (justincc) | 2010-10-30 | 2 | -33/+34 |
| * | 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 | 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 |
* | | | READ CAREFULLY!!! This is a BROKEN commit. It is UNTESTED and INCOMPLETE. | Melanie | 2010-10-30 | 11 | -423/+282 |
|/ / | |||||
* | | 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 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 |
* | | | | Add my work on top of cmickeyb's | Melanie | 2010-10-29 | 3 | -1/+133 |
* | | | | 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 |
| | * | | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-19 | 3 | -4/+7 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-19 | 1 | -17/+62 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-19 | 1 | -3/+3 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-19 | 1 | -13/+17 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-19 | 1 | -4/+15 |
| | |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-19 | 1 | -0/+27 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-18 | 1 | -48/+76 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-18 | 1 | -0/+301 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-18 | 2 | -3/+4 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-18 | 3 | -14/+18 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-18 | 1 | -2/+2 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-18 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-18 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-18 | 1 | -0/+2 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-18 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |