aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
...
| * Merge commit 'cmickeyb/dev-appearance'Melanie2010-10-294-157/+207
| |\
| | * Bunch of fixes that reduce the number of times appearanceMaster ScienceSim2010-10-291-18/+17
| | * Configuration of persistent baked textures and save/send delays.Master ScienceSim2010-10-281-1/+13
| | * Merge branch 'opensim-master' into dev-appearanceMaster ScienceSim2010-10-281-0/+2
| | |\
| | * | Added background thread to handle delayed send and save of appearanceMaster ScienceSim2010-10-281-4/+7
| | * | Small cleanup and add more debugging informationMaster ScienceSim2010-10-262-8/+23
| | * | Half of the compatibility is working. Login into a new region withMaster ScienceSim2010-10-253-20/+28
| | * | 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-211-68/+70
| * | | 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-298-504/+602
|\ \ \ \ | |/ / /
| * | | Merge branch 'dev-appearance'Melanie2010-10-298-504/+602
| |\ \ \
| | * \ \ Merge branch 'dev-appearance' of git://github.com/cmickeyb/opensim into dev-a...Melanie2010-10-218-504/+602
| | |\ \ \ | | | |/ /
| | | * | Major refactoring of appearance handling.Master ScienceSim2010-10-208-504/+602
| * | | | Revert "Preliminary work on appearance layers. No user functionality yet."Melanie2010-10-291-193/+258
| * | | | Preliminary work on appearance layers. No user functionality yet.Melanie2010-10-291-258/+193
| | |_|/ | |/| |
* | | | Revert "Preliminary work on appearance layers. No user functionality yet."Melanie2010-10-291-193/+258
* | | | Preliminary work on appearance layers. No user functionality yet.Melanie2010-10-291-258/+193
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-234-38/+9
|\ \ \ \ | |/ / /
| * | | Revert "Merge remote branch 'otakup0pe/mantis5110'"Justin Clark-Casey (justincc)2010-10-223-38/+7
| * | | Merge branch 'hg16' into mantis5110Jonathan Freedman2010-10-223-7/+38
| |\ \ \
| | * | | * remove some spurious debug infoJonathan Freedman2010-10-201-5/+5
| | * | | Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-174-6/+146
| | |\ \ \ | | | | |/ | | | |/|
| | * | | * more url / hg cleanupJonathan Freedman2010-10-112-4/+29
| | * | | Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-102-17/+21
| | |\ \ \
| | * \ \ \ Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-051-1/+36
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-031-0/+11
| | |\ \ \ \ \
| | * | | | | | * refactor refactor refactor ServerURI 4 lyfeJonathan Freedman2010-10-022-6/+12
| * | | | | | | Allow OARs and IARs to save and load meshes.Justin Clark-Casey (justincc)2010-10-221-0/+2
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-213-7/+38
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | * remove some spurious debug infoJonathan Freedman2010-10-201-5/+5
| * | | | | | * more url / hg cleanupJonathan Freedman2010-10-202-4/+29
| * | | | | | * refactor refactor refactor ServerURI 4 lyfeJonathan Freedman2010-10-202-6/+12
| |/ / / / /
* | | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-181-6/+51
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Adding osFunctions for light projectionBlueWall2010-10-171-5/+50
| * | | | | Add missing check for !_projectionEntryBlueWall2010-10-161-1/+1
* | | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-164-4/+99
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Adding projected light filters to prim propetiesBlueWall2010-10-151-0/+80
| * | | | | * Tweaked the upload response and now at least uploading the mesh works.Teravus Ovares (Dan Olivares)2010-10-141-0/+14
| * | | | | Kill some magic numbers in the caps moduleMelanie2010-10-141-3/+3
| * | | | | * Partially complete stuff for Mesh support that Melanie wanted to see before...Teravus Ovares (Dan Olivares)2010-10-141-1/+2
| | |_|_|/ | |/| | |
* | | | | Add a setter to OldItemID so it can be deserializedMelanie2010-10-131-0/+3
* | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-092-17/+21
|\ \ \ \ \ | |/ / / /
| * | | | minor: remove some mono compiler warningsJustin Clark-Casey (justincc)2010-10-091-4/+4
| * | | | Limit formatting of local console output to actual logging messages.Marck2010-10-091-13/+17
| | |_|/ | |/| |
* | | | Make SendKillObject send multiple localIDs in one packet. This avoids theMelanie2010-10-081-1/+1
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-041-1/+36
|\ \ \ \ | |/ / /
| * | | Added viewer's channel, mac, and id0 to agent circuit data. Also moved client...Diva Canto2010-10-031-1/+36
| | |/ | |/|
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-031-0/+11
|\ \ \ | |/ /
generated by cgit v1.1 at 2024-12-26 11:58:41 +0000