aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge git://github.com/opensim/opensim into mantis5110Jonathan Freedman2010-11-0530-91/+289
|\
| * Fix playing sound from HUDsMelanie2010-11-052-2/+17
| * Fix attached sounds from HUDs erroneously being delivered to other avatarsMelanie2010-11-051-0/+19
| * Delete existing presences for a user ID when they log in again.Melanie2010-11-051-0/+13
| * Add lsClearWindlightScene() to the lightshare module to remove WL settingsMelanie2010-11-0312-1/+64
| * When LightShare is enabled, the standard day cycle is bypassed and replaced byMelanie2010-11-034-1/+5
| * Change the default of the new bind_ip_address RemoteAdmin option to 0.0.0.0Melanie2010-11-031-1/+1
| * Admin Server can now bind to a private ip addressmores2010-11-032-1/+12
| * 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
| * Fix avatar height managementMelanie2010-11-021-24/+11
| * Fix default club feetMelanie2010-11-021-1/+1
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-11-022-0/+35
| |\
| | * Add support for cross-domain AJAX requests to REST console.Marck2010-11-021-0/+31
| | * Support for CORS with simple requests in BaseHttpServerMarck2010-11-021-0/+4
| * | Fix sitting and standing upMelanie2010-11-021-5/+14
| |/
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-11-027-56/+92
| |\
| | * 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
| | * Fix HypergridLinker.Check4096()Marck2010-11-011-1/+28
| * | Try to not make avatars switch outfitsMelanie2010-11-021-3/+0
* | | Merge branch 'master' into mantis5110Jonathan Freedman2010-10-311-2/+2
|\ \ \ | | |/ | |/|
| * | Removed a couple of very verbose debug messages.Diva Canto2010-10-311-2/+2
| |/
* | * better semantics for link-region commandJonathan Freedman2010-10-301-21/+21
* | Merge branch 'master' into mantis5110Jonathan Freedman2010-10-307-60/+168
|\ \ | |/
| * Fixed: ToAvatarAppearance wasn't retrieving the AvatarHeight.Diva Canto2010-10-301-0/+3
| * 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-306-49/+154
* | Merge branch 'master' into mantis5110Jonathan Freedman2010-10-302-5/+1
|\ \ | |/
| * * AbsolutePosition.Get{} returns incorrect result for child prim so switch to...Teravus Ovares (Dan Olivares)2010-10-301-1/+1
| * On first login, Ruth is back now. Strangely, inventory items are created forMelanie2010-10-301-4/+0
* | Merge branch 'master' into mantis5110Jonathan Freedman2010-10-3016-486/+342
|\ \ | |/
| * Logins work now, but avatars are green ugly gnomes.Melanie2010-10-301-2/+0
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-10-301-22/+0
| |\
| | * 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
| * | | This commit fixes all the appearance related null refs. Still can't log in,Melanie2010-10-304-59/+80
| | |/ | |/|
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-10-301-1/+1
| |\ \ | | |/
| | * Set async_packet_handling = true by defaultJustin Clark-Casey (justincc)2010-10-301-1/+1
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-10-3011-103/+98
| |\ \ | | |/
| | * Change level of some logging messages, turning some info into arguably more a...Justin Clark-Casey (justincc)2010-10-302-33/+34
| * | READ CAREFULLY!!! This is a BROKEN commit. It is UNTESTED and INCOMPLETE.Melanie2010-10-3011-423/+282
* | | 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-296-82/+270
|\ \ \ | |/ /