aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Expand)AuthorAgeFilesLines
...
| | * 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
| |/ /
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-2913-303/+553
|\ \ \ | |/ /
| * | Merge commit 'cmickeyb/dev-appearance'Melanie2010-10-2913-303/+553
| |\ \
| | * | 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-282-5/+27
| | * | Merge branch 'opensim-master' into dev-appearanceMaster ScienceSim2010-10-2821-120/+261
| | |\ \
| | * | | 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-291-1/+99
* | | | | Add my work on top of cmickeyb'sMelanie2010-10-291-1/+99
* | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-2931-810/+982
|\ \ \ \ \ | |/ / / /
| * | | | 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
| | |\ \ \ \ | | | |/ / /
| | | * | | Major refactoring of appearance handling.Master ScienceSim2010-10-2028-779/+955
| * | | | | Revert "Preliminary work on appearance layers. No user functionality yet."Melanie2010-10-292-201/+261
| * | | | | Preliminary work on appearance layers. No user functionality yet.Melanie2010-10-292-261/+201
| | |_|_|/ | |/| | |
| * | | | HypergridLinker optimizations and enable use of owner_uuid/EstateOwner with l...Marck2010-10-281-20/+27
| | |_|/ | |/| |
| * | | Formatting cleanup.Jeff Ames2010-10-282-2/+1
* | | | Fix a LSL issue and a prim naming issueMelanie2010-10-292-7/+16
* | | | Revert "Preliminary work on appearance layers. No user functionality yet."Melanie2010-10-293-209/+265
* | | | Preliminary work on appearance layers. No user functionality yet.Melanie2010-10-293-265/+209
* | | | Fix attached sounds from HUDs erroneously being delivered to other avatarsMelanie2010-10-281-0/+19
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-2711-73/+68
|\ \ \ \ | |/ / /
| * | | 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
| |/ / /
* | | | Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/va...Melanie2010-10-254-16/+37
|\ \ \ \
| * | | | Comment repeated add and remove of avatars from the physical scene. It's noMelanie2010-10-251-16/+22
| * | | | Implement llGetLinkNumberOfSides(), needed for 1-script sculptie foot shoeMelanie2010-10-253-0/+15
* | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-252-5/+18
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | * 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
* | | | Add PRIM_NAME, PRIM_DESC and PRIM_ROT_LOCALMelanie2010-10-242-0/+30
* | | | Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca...Melanie2010-10-241-2/+11
|\ \ \ \
| * | | | Prevent an exception if a string passed into llXorBase64StringsCorrect is notMelanie2010-10-231-2/+11
* | | | | Change the results from llGetPrimitiveParams to be the same as SL forMelanie2010-10-242-8/+1
|/ / / /
* | | | Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/va...Melanie2010-10-231-20/+8
|\ \ \ \
| * \ \ \ Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca...Melanie2010-10-235-37/+49
| |\ \ \ \
| * | | | | Prevent database lookups on every avatar movement when land is set to groupMelanie2010-10-231-20/+8