aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-297-17065/+17065
|\
| * Merge branch 'master' of ssh://MyConnection/var/git/opensimTeravus Ovares (Dan Olivares)2010-10-301-4/+0
| |\
| * | * Thank you lkalif for fixing the {array[array[]]} json OSD serialization issue.Teravus Ovares (Dan Olivares)2010-10-307-17065/+17065
* | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-291-4/+0
|\ \ \ | | |/ | |/|
| * | On first login, Ruth is back now. Strangely, inventory items are created forMelanie2010-10-301-4/+0
| |/
* | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-291-2/+0
|\ \ | |/
| * Logins work now, but avatars are green ugly gnomes.Melanie2010-10-301-2/+0
* | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-294-59/+80
|\ \ | |/
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-10-303-25/+5
| |\
| * | This commit fixes all the appearance related null refs. Still can't log in,Melanie2010-10-304-59/+80
* | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-293-25/+5
|\ \ \ | | |/ | |/|
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-10-3011-423/+282
| |\ \ | | |/
| * | minor: remove some old commented out codeJustin Clark-Casey (justincc)2010-10-301-22/+0
| * | Clarify comment for configuration option Check4096 and show the default value.Marck2010-10-302-3/+5
* | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-2911-423/+282
|\ \ \ | | |/ | |/|
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-10-302-2/+3
| |\ \ | | |/
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-10-3011-103/+98
| |\ \
| * | | READ CAREFULLY!!! This is a BROKEN commit. It is UNTESTED and INCOMPLETE.Melanie2010-10-3011-423/+282
* | | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-294-35/+37
|\ \ \ \ | | |_|/ | |/| |
| * | | Set async_packet_handling = true by defaultJustin Clark-Casey (justincc)2010-10-302-2/+3
| | |/ | |/|
| * | Change level of some logging messages, turning some info into arguably more a...Justin Clark-Casey (justincc)2010-10-302-33/+34
* | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-291-3/+3
|\ \ \ | |/ /
| * | tweak a few more scene presence logging messages for consistencyJustin Clark-Casey (justincc)2010-10-291-3/+3
* | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-294-57/+39
|\ \ \ | |/ /
| * | Rationalize the logging messages from the merged appearance branch, commentin...Justin Clark-Casey (justincc)2010-10-294-57/+39
* | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-296-11/+23
|\ \ \ | |/ /
| * | 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' of /var/git/opensim/opensim mirror account2010-10-292-1/+1
|\ \ \ | |/ /
| * | 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 branch 'master' of /var/git/opensim/opensim mirror account2010-10-2914-303/+567
|\ \ \ | |/ /
| * | 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
| | * | 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
| | |\ \
| | * | | 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
* | | | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-293-1/+133
|\ \ \ \ \ | |/ / / /
| * | | | Add my work on top of cmickeyb'sMelanie2010-10-293-1/+133
* | | | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-2931-766/+967
|\ \ \ \ \ | |/ / / /
| * | | | 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
| | |\ \ \ \ | | | |/ / /
generated by cgit v1.1 at 2024-12-21 09:15:03 +0000