aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-181-8/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-184-44/+101
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-173-120/+86
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-174-5/+105
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-161-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-161-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-151-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-153-10/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-156-11/+33
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-152-1/+23
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-153-38/+41
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-151-3/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-1511-143/+189
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-152-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-151-0/+80
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-141-0/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-140-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-141-71/+71
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \