aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Connectors (follow)
Commit message (Expand)AuthorAgeFilesLines
* Plumb a code path for the entity transfer module to ask a destination sceneMelanie2010-12-091-0/+59
* Merge branch 'master' into careminster-presence-refactorMelanie2010-12-066-69/+37
|\
| * Fixed some inconsistency with trailing /. Made debug messages consistent. Cha...Diva Canto2010-12-051-14/+14
| * Merge branch 'master-core' into mantis5110Jonathan Freedman2010-11-231-1/+8
| |\
| | * Fix some crashes caused by the addition of the CreatorData columnMelanie2010-11-231-1/+8
| * | Merge branch 'master-core' into mantis5110Jonathan Freedman2010-11-214-0/+110
| |\ \ | | |/
| * | Merge https://github.com/opensim/opensim into mantis5110Jonathan Freedman2010-11-211-3/+3
| |\ \
| * \ \ Merge git://github.com/opensim/opensim into mantis5110Jonathan Freedman2010-11-051-0/+4
| |\ \ \
| * \ \ \ Merge branch 'master' into mantis5110Jonathan Freedman2010-10-302-52/+53
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into mantis5110Jonathan Freedman2010-10-292-1/+93
| |\ \ \ \ \
* | | | | | | Add the ability for gods to impersonate users. For this, bit 6 needs to beMelanie2010-11-252-0/+10
* | | | | | | Fix some crashes caused by the addition of the CreatorData columnMelanie2010-11-221-1/+8
* | | | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-11-222-0/+5
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-11-222-0/+5
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2010-11-211-0/+103
| | |\ \ \ \ \ \
| | * | | | | | | Added creator info across the board -- TaskInventoryItems and InventoryItems ...Diva Canto2010-11-212-0/+5
| * | | | | | | | Fox the buglets in Freeswitch. Grid mode works now and there is no reason why...Melanie2010-11-221-2/+3
| | |/ / / / / / | |/| | | | | |
| * | | | | | | Add the remote connector for freeswitch config retrievalMelanie2010-11-211-0/+103
| |/ / / / / /
| * | | | | | Change the way attachments are persisted. Editing a worn attachment will nowMelanie2010-11-161-0/+1
| | |_|_|_|/ | |/| | | |
* | | | | | Fox the buglets in Freeswitch. Grid mode works now and there is no reason why...Melanie2010-11-221-2/+3
* | | | | | Add the remote connector for freeswitch config retrievalMelanie2010-11-211-0/+103
* | | | | | Change the way attachments are persisted. Editing a worn attachment will nowMelanie2010-11-161-0/+1
* | | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-11-091-3/+3
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Formatting cleanup.Jeff Ames2010-11-081-3/+3
| | |_|_|/ | |/| | |
* | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-11-031-0/+4
|\ \ \ \ \ | |/ / / /
| * | | | Add lsClearWindlightScene() to the lightshare module to remove WL settingsMelanie2010-11-031-0/+4
| | |_|/ | |/| |
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-11-022-54/+55
|\ \ \ \ | |/ / /
| * | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-10-301-28/+28
| |\ \ \
| | * | | Change level of some logging messages, turning some info into arguably more a...Justin Clark-Casey (justincc)2010-10-301-28/+28
| * | | | READ CAREFULLY!!! This is a BROKEN commit. It is UNTESTED and INCOMPLETE.Melanie2010-10-301-26/+27
| |/ / /
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-292-1/+93
|\ \ \ \ | |/ / /
| * | | Merge branch 'dev-appearance'Melanie2010-10-292-1/+93
| |\ \ \
| | * \ \ Merge branch 'dev-appearance' of git://github.com/cmickeyb/opensim into dev-a...Melanie2010-10-212-1/+93
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Major refactoring of appearance handling.Master ScienceSim2010-10-202-1/+93
* | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-235-29/+70
|\ \ \ \ \ | |/ / / /
| * | | | Revert "Merge remote branch 'otakup0pe/mantis5110'"Justin Clark-Casey (justincc)2010-10-226-42/+74
| | |_|/ | |/| |
| * | | * change the data exchanged within hypergrid transactionsJonathan Freedman2010-10-212-14/+23
| * | | Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-201-1/+1
| |\ \ \ | | | |/ | | |/|
| * | | * remove some spurious debug infoJonathan Freedman2010-10-201-15/+15
| * | | Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-052-5/+9
| |\ \ \
| * \ \ \ Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-031-1/+1
| |\ \ \ \
| * | | | | * additional serveruri cleanupJonathan Freedman2010-10-032-17/+7
| * | | | | * refactor refactor refactor ServerURI 4 lyfeJonathan Freedman2010-10-025-58/+27
* | | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-216-76/+31
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | * remove some spurious debug infoJonathan Freedman2010-10-201-15/+15
| * | | | | * additional serveruri cleanupJonathan Freedman2010-10-202-17/+7
| * | | | | * refactor refactor refactor ServerURI 4 lyfeJonathan Freedman2010-10-205-58/+27
| | |_|_|/ | |/| | |
| * | | | Deleted verbose debug messages that are bringing sims to an halt. Increased t...Diva Canto2010-10-191-1/+1
| | |_|/ | |/| |
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-041-2/+6
|\ \ \ \ | |/ / /
| * | | Added viewer's channel, mac, and id0 to agent circuit data. Also moved client...Diva Canto2010-10-031-2/+6