aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | | Preliminary work on appearance layers. No user functionality yet.Melanie2010-10-291-3/+8
| | |_|/ | |/| |
| * | | 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-292-16/+7
* | | | Preliminary work on appearance layers. No user functionality yet.Melanie2010-10-292-7/+16
* | | | 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
* | | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-2314-54/+176
|\ \ \ \ \ \ | |_|/ / / / |/| | / / / | | |/ / / | |/| | |
| * | | | 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
| | | |\ \ \ \