aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into mantis5110Jonathan Freedman2010-10-299-70/+64
|\
| * tweak a few more scene presence logging messages for consistencyJustin Clark-Casey (justincc)2010-10-291-3/+3
| * Rationalize the logging messages from the merged appearance branch, commentin...Justin Clark-Casey (justincc)2010-10-294-57/+39
| * Merge branch 'justincc-dev'Justin Clark-Casey (justincc)2010-10-296-11/+23
| |\
| | * add timing report to CompleteScenePresence for diagnostic purposesJustin Clark-Casey (justincc)2010-10-291-1/+8
| | * for now, comment out some older or redundant log debug lines to make diagnost...Justin Clark-Casey (justincc)2010-10-294-6/+6
| | * Add number of ms it takes to complete UseCircuitCode packet handling to log f...Justin Clark-Casey (justincc)2010-10-291-2/+8
* | | Merge branch 'master' into mantis5110Jonathan Freedman2010-10-299-82/+304
|\ \ \ | |/ /
| * | Rename the new default texture to be consistent with the othersMelanie2010-10-292-1/+1
| * | Add a default alpha layerMelanie2010-10-291-0/+0
| * | Merge commit 'cmickeyb/dev-appearance'Melanie2010-10-2914-303/+567
| |\ \
| | * | Clean up some cruft from the last commit. Re-add the initial updateMaster ScienceSim2010-10-292-2/+41
| | * | Bunch of fixes that reduce the number of times appearanceMaster ScienceSim2010-10-295-81/+132
| * | | Add my work on top of cmickeyb'sMelanie2010-10-293-1/+133
| * | | Merge branch 'dev-appearance'Melanie2010-10-2928-779/+954
| |\ \ \
| | * \ \ Merge branch 'dev-appearance' of git://github.com/cmickeyb/opensim into dev-a...Melanie2010-10-2128-780/+956
| | |\ \ \
| * | | | | Revert "Preliminary work on appearance layers. No user functionality yet."Melanie2010-10-294-235/+261
| * | | | | Preliminary work on appearance layers. No user functionality yet.Melanie2010-10-294-261/+235
| | |_|_|/ | |/| | |
* | | | | Merge branch 'master' into mantis5110Jonathan Freedman2010-10-292-23/+30
|\ \ \ \ \ | |/ / / /
| * | | | HypergridLinker optimizations and enable use of owner_uuid/EstateOwner with l...Marck2010-10-282-20/+28
* | | | | Merge branch 'master' into mantis5110Jonathan Freedman2010-10-2942-934/+1275
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Configuration of persistent baked textures and save/send delays.Master ScienceSim2010-10-283-5/+41
| * | | | Merge branch 'opensim-master' into dev-appearanceMaster ScienceSim2010-10-2828-130/+273
| |\ \ \ \ | | |/ / /
| | * | | Formatting cleanup.Jeff Ames2010-10-282-2/+1
| | * | | Prevent nullrefs in scene object deletion. Mantis #5156Melanie2010-10-271-1/+4
| | * | | Merge branch 'master' of ssh://MyConnection01/var/git/opensimdahlia2010-10-269-63/+37
| | |\ \ \
| | | * | | Formatting cleanup.Jeff Ames2010-10-279-63/+37
| | * | | | Overload Scene.NewUserConnection() to facilitate NPCs and other region specif...dahlia2010-10-261-9/+27
| | |/ / /
| * | | | Added background thread to handle delayed send and save of appearanceMaster ScienceSim2010-10-282-59/+171
| * | | | Small cleanup and add more debugging informationMaster ScienceSim2010-10-262-8/+23
| * | | | Made the check for texture assets asynchronous. This is one part ofMaster ScienceSim2010-10-261-7/+10
| * | | | Half of the compatibility is working. Login into a new region withMaster ScienceSim2010-10-254-21/+29
| * | | | Intermediate commit for backward compatability; does not compile yetMic Bowman2010-10-252-62/+73
| * | | | First attempt to get multiple attachments working to support viewer2.Master ScienceSim2010-10-216-111/+100
| | |_|/ | |/| |
| * | | Major refactoring of appearance handling.Master ScienceSim2010-10-2028-779/+955
| * | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-193-4/+7
| |\ \ \
| * \ \ \ Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-191-17/+62
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-191-3/+3
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-191-13/+17
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-191-4/+15
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-191-0/+27
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-181-48/+76
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-181-0/+301
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-182-3/+4
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-183-14/+18
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-181-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-181-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-181-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-181-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-181-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
generated by cgit v1.1 at 2024-08-26 19:57:06 +0000