aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Connectors/SimianGrid (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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
| * Revert "* Changed 11 calls for session info to the more optimized API method"root2010-09-171-2/+2
* | Revert "* Changed 11 calls for session info to the more optimized API method"root2010-09-171-2/+2
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-138-74/+66
|\ \ | |/
| * First pass at cleaning up thread safety in EntityManager and SceneGraphJohn Hurliman2010-09-101-1/+4
| * * Run SimianGrid session updates asynchronously instead of from the main hear...John Hurliman2010-09-096-66/+5
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJohn Hurliman2010-09-082-0/+10
| |\
| | * Added constructor that takes an URL to asset and inventory simian connectors.Diva Canto2010-09-082-0/+10
| * | * Changed 11 calls for session info to the more optimized API methodJohn Hurliman2010-09-081-2/+2
| |/
| * Rolling back the recent libomv update but keeping the ExpiringCache cleanups ...John Hurliman2010-09-071-3/+3
| * * Cache null account responses in the SimianUserAccountServiceConnector to av...John Hurliman2010-09-071-3/+13
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJohn Hurliman2010-09-077-119/+140
| |\
| | * Fix Simian regressionMelanie2010-09-077-119/+140
| * | * Added sanity checks to the SimianAssetServiceConnector so it will throw a s...John Hurliman2010-09-071-0/+30
| |/
| * SimianUserAccountServiceConnector was not initializing the user cacheJohn Hurliman2010-09-071-2/+2
* | Fix Simian regressionMelanie2010-09-077-119/+140
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-059-110/+180
|\ \ | |/
| * Fix a handful of copypaste errorsMelanie2010-09-054-4/+4
| * Change UserAccountService to matchMelanie2010-09-051-12/+22
| * Make Simian profiles respect the module chosen in [Profile]Melanie2010-09-051-2/+10
| * Fix up presence connector in SimianGridMelanie2010-09-051-12/+22
| * Fix up Simian inentoryMelanie2010-09-051-18/+30
| * Friends works differently, it' snot even a region module at all, but a connectorMelanie2010-09-051-16/+1
| * And the avatar services :)Melanie2010-09-051-12/+22
| * Add the m_Enabled pattern to Simian AuthMelanie2010-09-051-12/+22
| * Add m_Enabled pattern to SimianGridConnectorMelanie2010-09-051-14/+28
| * As an exmple, add the code to disable connectors intot he simian assetMelanie2010-09-051-12/+23
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-0510-184/+105
|\ \ | |/