aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Connectors/SimianGrid (follow)
Commit message (Expand)AuthorAgeFilesLines
* Resolve merge commits, stage 1Tom2011-09-042-3/+3
|\
| * comment out some of the currently less useful debug log messagesJustin Clark-Casey (justincc)2011-08-111-1/+1
| * Get rid of AvatarAppearance.Owner to simplify the code.Justin Clark-Casey (justincc)2011-08-021-2/+2
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-06-091-4/+21
|\ \ | |/
| * More on HG Friends. Added Delete(string, string) across the board. Added secu...Diva Canto2011-05-221-1/+6
| * Fixed permissions bug related to friends in PermissionsModule. Added FriendsD...Diva Canto2011-05-211-3/+15
| * HG Friends working to some extent: friendships offered and accepted correctly...Diva Canto2011-05-191-1/+1
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-02-071-0/+262
|\ \ | |/
| * Convert SimianMaptile refresh time from ms to seconds. Too many 0'sMic Bowman2011-02-041-11/+12
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-01-184-23/+22
|\ \ | |/
| * minor: remove mono compiler warningsJustin Clark-Casey (justincc)2011-01-181-2/+2
| * Reduce amount of debug lopgging put out by some simiangrid connectors. Pleas...Justin Clark-Casey (justincc)2011-01-184-21/+20
| * Moved the map tile processing used by the Simian GridMic Bowman2011-01-082-86/+261
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-01-062-4/+2
|\ \ | |/
| * comment out a couple simian debug messagesMic Bowman2011-01-052-4/+2
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-301-68/+50
|\ \ | |/
| * Update SimianGridServicesConnector to work more likeMic Bowman2010-12-271-68/+50
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-061-3/+1
|\ \ | |/
| * Merge branch 'master-core' into mantis5110Jonathan Freedman2010-11-211-0/+2
| |\
| * \ Merge https://github.com/opensim/opensim into mantis5110Jonathan Freedman2010-11-211-3/+3
| |\ \
| * \ \ Merge branch 'master' into mantis5110Jonathan Freedman2010-10-301-26/+27
| |\ \ \
| * \ \ \ Merge branch 'master' into mantis5110Jonathan Freedman2010-10-291-1/+81
| |\ \ \ \
* | | | | | Add the ability for gods to impersonate users. For this, bit 6 needs to beMelanie2010-11-251-0/+5
* | | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-11-221-0/+2
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Added creator info across the board -- TaskInventoryItems and InventoryItems ...Diva Canto2010-11-211-0/+2
| | |_|_|/ | |/| | |
* | | | | 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-021-26/+27
|\ \ \ \ | |/ / /
| * | | 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-291-1/+81
|\ \ \ \ | |/ / /
| * | | Merge branch 'dev-appearance'Melanie2010-10-291-1/+81
| |\ \ \
| | * \ \ Merge branch 'dev-appearance' of git://github.com/cmickeyb/opensim into dev-a...Melanie2010-10-211-1/+81
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Major refactoring of appearance handling.Master ScienceSim2010-10-201-1/+81
* | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-231-1/+3
|\ \ \ \ \ | |/ / / /
| * | | | Revert "Merge remote branch 'otakup0pe/mantis5110'"Justin Clark-Casey (justincc)2010-10-221-1/+3
| | |_|/ | |/| |
| * | | Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-051-3/+3
| |\ \ \ | | | |/ | | |/|
| * | | Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-031-1/+1
| |\ \ \
| * | | | * refactor refactor refactor ServerURI 4 lyfeJonathan Freedman2010-10-021-3/+1
* | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-211-3/+1
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | * refactor refactor refactor ServerURI 4 lyfeJonathan Freedman2010-10-201-3/+1
| | |_|/ | |/| |
| * | | Add linden prim renderer and update libOMVMelanie2010-10-041-3/+3
| | |/ | |/|
* | | Add linden prim renderer and update libOMVMelanie2010-10-041-3/+3
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-031-1/+1
|\ \ \ | |/ /
| * | Initial port of the Warp3D map tile rendererMelanie2010-10-031-1/+1
| |/
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-021-5/+33
|\ \ | |/
| * couple fixes to enable profiles in simian connectorMaster ScienceSim2010-09-301-5/+33
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-302-16/+12
|\ \ | |/
| * Actually log users out (call LogoutAgent) in the SimianPresenceServiceConnect...John Hurliman2010-09-291-0/+6
| * Part two of the previous commit, making IGridUserService.LoggedOut() more fle...John Hurliman2010-09-292-6/+2
| * Made IGridUserService.SetLastPosition() more flexible to allow different poss...John Hurliman2010-09-292-10/+4
generated by cgit v1.1 at 2024-09-29 09:33:55 +0000