aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Connectors (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-01-071-1/+1
|\
| * minor: remove mono compiler warningJustin Clark-Casey (justincc)2012-01-071-1/+1
* | Fix up asset stuffMelanie2012-01-061-0/+3
* | Remove a dangling command registrationMelanie2012-01-051-4/+0
* | Merge branch 'master' into careminsterMelanie2012-01-061-39/+0
|\ \ | |/
| * Move simulator asset info commands to an optional module from the connector. ...Justin Clark-Casey (justincc)2012-01-051-43/+2
* | Merge branch 'master' into careminsterMelanie2012-01-051-0/+54
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2012-01-031-0/+6
| |\
| * | Profile UpdatesBlueWall2012-01-031-0/+54
* | | Merge branch 'master' into careminsterMelanie2012-01-024-1/+10
|\ \ \ | | |/ | |/|
| * | Adding commented out log messages and some minor formatting for future bug hu...Justin Clark-Casey (justincc)2012-01-021-0/+6
| |/
| * Set the local grid flag in the user account through the simian connectorMic Bowman2011-12-291-0/+4
| * HG: more adjustments for making HG Simian work. Added server_uri as new key o...Diva Canto2011-12-292-1/+4
* | Merge branch 'master' into careminsterMelanie2011-12-282-4/+44
|\ \ | |/
| * HG: more / love for XmasDiva Canto2011-12-242-4/+44
* | Merge branch 'master' into careminsterMelanie2011-12-243-1/+6
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2011-12-231-25/+56
| |\
| * | HG: AAdded a few missing /'s at the end of URLsDiva Canto2011-12-233-1/+6
* | | Merge branch 'master' into careminsterMelanie2011-12-231-25/+56
|\ \ \ | | |/ | |/|
| * | Enables processing of hypergrid links through simiangrid services. ThanksMic Bowman2011-12-221-25/+56
| |/
* | Merge branch 'master' into careminsterMelanie2011-12-181-0/+1
|\ \ | |/
| * HG minor bug fix and marked one method obsolete in UAS.Diva Canto2011-12-161-0/+1
* | Merge branch 'master' into bigmergeMelanie2011-12-052-1/+3
|\ \ | |/
| * HG: Added HEAD method to Helo service. This is the preferred method, but its ...Diva Canto2011-12-041-0/+2
| * HG: Renamed one methodDiva Canto2011-12-041-1/+1
* | Merge branch 'master' into bigmergeMelanie2011-11-242-20/+49
|\ \ | |/
| * Append asset ID to URL for storage requests to allow caching proxies to work ...Dan Lake2011-11-231-1/+3
| * Improve the error messages returned if the HelloNeighbour call fails.Justin Clark-Casey (justincc)2011-11-211-19/+46
* | Merge branch 'master' into bigmergeMelanie2011-11-192-2/+4
|\ \ | |/
| * Get rid of the spurious [WEB UTIL] couldn't decode <OpenSim agent 57956c4b-ff...Justin Clark-Casey (justincc)2011-11-191-1/+1
| * Don't register a region twice on both official registration and maptile regen...Justin Clark-Casey (justincc)2011-11-191-1/+3
* | Merge branch 'master' into bigmergeMelanie2011-11-172-17/+17
|\ \ | |/
| * distinguish between FriendsSimConnector and FriendsServiceConnector in logJustin Clark-Casey (justincc)2011-11-152-17/+17
* | Merge branch 'master' into bigmergeMelanie2011-11-041-1/+1
|\ \ | |/
| * Drop the CopyTo parameter from Int32.MaxValue to 4096. This is a buffer sizeMic Bowman2011-11-021-1/+1
* | Merge branch 'master' into bigmergeMelanie2011-11-031-1/+1
|\ \ | |/
| * Revert "fix CopyTo call that was breaking under mono 2.10"Melanie2011-11-031-1/+1
* | Merge branch 'master' into bigmergeMelanie2011-11-031-1/+1
|\ \ | |/
| * fix CopyTo call that was breaking under mono 2.10Mic Bowman2011-11-021-1/+1
* | Merge commit '4c9400e6460a73baa2d687afe73a62c6efca9f37' into bigmergeMelanie2011-10-252-0/+22
|\ \ | |/
| * Add optional getauthinfo and setauthinfo authentication service calls.Justin Clark-Casey (justincc)2011-10-242-0/+22
* | Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmergeMelanie2011-10-121-1/+6
|\ \
| * \ Merge commit '1458fab82c4dab9901d81419e6b515f47ea7320f' into bigmergeMelanie2011-10-111-1/+6
| |\ \ | | |/
| | * Reattaching a region was failing if the estate name had not changed (issue 50...Kevin Houlihan2011-09-161-1/+6
* | | Merge branch 'careminster-presence-refactor' into bigmergeMelanie2011-10-061-8/+61
|\ \ \ | |/ / |/| |
| * | Change the asset connector to allow connection to different asset serversMelanie2011-10-061-7/+61
* | | Bring us up to date.Tom2011-09-141-12/+12
|\ \ \ | | |/ | |/|
| * | Increase information in logging for UserAgentServiceConnector.Justin Clark-Casey (justincc)2011-09-081-12/+12
* | | Resolve merge commits, stage 1Tom2011-09-046-48/+88
|\ \ \ | |/ / | | / | |/ |/|
| * comment out some of the currently less useful debug log messagesJustin Clark-Casey (justincc)2011-08-111-1/+1