aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-10-307-51/+53
|\
| * Change level of some logging messages, turning some info into arguably more a...Justin Clark-Casey (justincc)2010-10-301-5/+6
| * 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-292-34/+23
| * Merge branch 'justincc-dev'Justin Clark-Casey (justincc)2010-10-295-10/+22
| |\
| | * 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-293-5/+5
| | * Add number of ms it takes to complete UseCircuitCode packet handling to log f...Justin Clark-Casey (justincc)2010-10-291-2/+8
* | | READ CAREFULLY!!! This is a BROKEN commit. It is UNTESTED and INCOMPLETE.Melanie2010-10-302-16/+20
|/ /
* | Merge commit 'cmickeyb/dev-appearance'Melanie2010-10-296-116/+327
|\ \
| * | 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-294-63/+115
| * | Configuration of persistent baked textures and save/send delays.Master ScienceSim2010-10-281-4/+14
| * | Merge branch 'opensim-master' into dev-appearanceMaster ScienceSim2010-10-2820-120/+259
| |\ \ | | |/
| * | Added background thread to handle delayed send and save of appearanceMaster ScienceSim2010-10-281-55/+164
| * | 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-251-1/+1
| * | First attempt to get multiple attachments working to support viewer2.Master ScienceSim2010-10-212-13/+11
* | | Merge branch 'dev-appearance'Melanie2010-10-2911-270/+233
|\ \ \
| * \ \ Merge branch 'dev-appearance' of git://github.com/cmickeyb/opensim into dev-a...Melanie2010-10-2111-271/+235
| |\ \ \ | | |/ /
| | * | Major refactoring of appearance handling.Master ScienceSim2010-10-2011-270/+234
* | | | Revert "Preliminary work on appearance layers. No user functionality yet."Melanie2010-10-291-8/+3
* | | | Preliminary work on appearance layers. No user functionality yet.Melanie2010-10-291-3/+8
| |_|/ |/| |
* | | 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
|/ / /
* | | * Updated libomv to r3461Latif Khalifa2010-10-241-2/+2
* | | Add PRIM_NAME, PRIM_DESC and PRIM_ROT_LOCALMelanie2010-10-242-0/+30
* | | Added inner exception handling in Shape deserialization processing, so that t...Diva Canto2010-10-231-3/+16
* | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-10-221-3/+3
|\ \ \
| * | | Change some exception to use ToString(). e.Message is not sufficient to fixMelanie2010-10-221-3/+3
* | | | Revert "Merge remote branch 'otakup0pe/mantis5110'"Justin Clark-Casey (justincc)2010-10-229-35/+54
|/ / /
* | | Merge remote branch 'otakup0pe/mantis5110'Justin Clark-Casey (justincc)2010-10-229-54/+35
|\ \ \
| * \ \ Merge branch 'hg16' into mantis5110Jonathan Freedman2010-10-229-54/+35
| |\ \ \
| | * | | * change the data exchanged within hypergrid transactionsJonathan Freedman2010-10-215-8/+14
| | * | | Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-202-19/+67
| | |\ \ \ | | | | |/ | | | |/|
| | * | | * remove some spurious debug infoJonathan Freedman2010-10-201-0/+2
| | * | | Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-202-8/+379
| | |\ \ \
| | * \ \ \ Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-186-64/+111
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-1719-322/+2240
| | |\ \ \ \ \
| | * | | | | | * more url / hg cleanupJonathan Freedman2010-10-112-26/+12
| | * | | | | | Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-105-15/+28
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-0713-69/+368
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-053-3/+20
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-0514-43/+76
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-0312-70/+1450
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | * additional serveruri cleanupJonathan Freedman2010-10-033-5/+5
| | * | | | | | | | | | | * refactor refactor refactor ServerURI 4 lyfeJonathan Freedman2010-10-023-22/+9