aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
...
* 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
| * Removed a couple of very verbose debug messages.Diva Canto2010-10-311-2/+2
* | Try to not make avatars switch outfitsMelanie2010-11-021-3/+0
|/
* 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-307-77/+154
* * 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://MyConnection/var/git/opensimTeravus Ovares (Dan Olivares)2010-10-301-4/+0
|\
| * On first login, Ruth is back now. Strangely, inventory items are created forMelanie2010-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
|/
* 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-303-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
* | | 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-302-2/+3
|\ \ | |/
| * Set async_packet_handling = true by defaultJustin Clark-Casey (justincc)2010-10-302-2/+3
* | 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
| * 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
* | | READ CAREFULLY!!! This is a BROKEN commit. It is UNTESTED and INCOMPLETE.Melanie2010-10-3011-423/+282
|/ /
* | 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 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
* | | | Add my work on top of cmickeyb'sMelanie2010-10-293-1/+133
* | | | Merge branch 'dev-appearance'Melanie2010-10-2928-779/+954
|\ \ \ \