aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Expand)AuthorAgeFilesLines
* Revert "Spin the AddNewClient process off into a new thread to avoid locking ...Melanie2010-11-051-24/+1
* Revert "Fix for hanging on "Connecting to region".. caused by packets being p...Melanie2010-11-055-75/+63
* Fix child prims returning after being unlinked and deleted where the root isMelanie2010-11-041-0/+5
* Fix avatar to avatar inventory gives across serversMelanie2010-11-041-8/+50
* Fix creation of a duplicate physics actor on chained drag-copy operations,Melanie2010-11-041-17/+0
* Fix playing sound from HUDsMelanie2010-11-032-10/+16
* Merge branch 'master' into careminster-presence-refactorMelanie2010-11-036-1/+33
|\
| * Add lsClearWindlightScene() to the lightshare module to remove WL settingsMelanie2010-11-035-0/+24
| * When LightShare is enabled, the standard day cycle is bypassed and replaced byMelanie2010-11-032-1/+3
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-11-031-0/+9
|\ \ | |/
| * Actually calculate the height before setting it, this isn't done automaticallyMelanie2010-11-031-1/+7
| * Trying to prevent a wrong physical actor sizeMelanie2010-11-031-0/+3
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-11-021-4/+1
|\ \ | |/
| * Fix avatar height managementMelanie2010-11-021-24/+11
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-11-0216-190/+185
|\ \ | |/
| * Fix sitting and standing upMelanie2010-11-021-5/+14
| * Old deserialization can't deal with commas in flag fields. Making use of -ver...Diva Canto2010-11-024-21/+30
| * Thanks Snoopy for a patch that addresses Mantis #0005165: osSetDynamicTexture...dahlia2010-11-021-32/+32
| * Removed a couple of very verbose debug messages.Diva Canto2010-10-311-2/+2
| * Move physics actor creation to after SetHeight to try and preventMelanie2010-10-301-11/+11
| * Fix logins and avatar appearance. Contains a Migration. May contain nuts.Melanie2010-10-302-5/+11
| * * AbsolutePosition.Get{} returns incorrect result for child prim so switch to...Teravus Ovares (Dan Olivares)2010-10-301-1/+1
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-10-302-16/+20
| |\
| | * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-10-301-1/+1
| | |\
| | * \ Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-10-307-51/+53
| | |\ \
| | * | | READ CAREFULLY!!! This is a BROKEN commit. It is UNTESTED and INCOMPLETE.Melanie2010-10-302-16/+20
| * | | | minor: remove some old commented out codeJustin Clark-Casey (justincc)2010-10-301-22/+0
| | |_|/ | |/| |
| * | | Set async_packet_handling = true by defaultJustin Clark-Casey (justincc)2010-10-301-1/+1
| | |/ | |/|
| * | 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
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-296-116/+327
|\ \ \ | |/ /
| * | 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 'master' into careminster-presence-refactorMelanie2010-10-2913-281/+234
|\ \ \ \ | |/ / /
| * | | 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