aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-01-122-7/+13
|\
| * HG: normalize all externalized user ULRs to be the Home URL, i.e. the locatio...Diva Canto2012-01-122-7/+13
* | 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-062-160/+3
|\ \ | |/
| * Move simulator asset info commands to an optional module from the connector. ...Justin Clark-Casey (justincc)2012-01-051-43/+2
| * Move asset commands from AssetService to AssetServerConnector so that we can ...Justin Clark-Casey (justincc)2012-01-051-121/+3
* | Merge branch 'master' into careminsterMelanie2012-01-053-0/+80
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2012-01-031-0/+6
| |\
| * | Profile UpdatesBlueWall2012-01-033-0/+80
* | | Merge branch 'master' into careminsterMelanie2012-01-026-31/+39
|\ \ \ | | |/ | |/|
| * | Adding commented out log messages and some minor formatting for future bug hu...Justin Clark-Casey (justincc)2012-01-021-0/+6
| |/
| * Bring back the Hyperlinker to the Robust console. Moved the config to [GridSe...Diva Canto2011-12-301-30/+25
| * Default LocalToGrid to true. Fixes minor bug introduced yesterday where old r...Diva Canto2011-12-301-5/+1
| * Set the local grid flag in the user account through the simian connectorMic Bowman2011-12-291-0/+4
| * Added field LocalToGrid in UserAccount. Context: make HG work in Simian.Diva Canto2011-12-291-0/+8
| * 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-221-0/+8
|\ \ | |/
| * HG: Verify that the user is localDiva Canto2011-12-211-0/+8
* | 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-055-4/+6
|\ \ | |/
| * 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-044-4/+4
* | Merge branch 'master' into bigmergeMelanie2011-11-281-1/+1
|\ \ | |/
| * minor: remove mono compiler warningJustin Clark-Casey (justincc)2011-11-241-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-195-10/+31
|\ \ | |/
| * Get rid of the spurious [WEB UTIL] couldn't decode <OpenSim agent 57956c4b-ff...Justin Clark-Casey (justincc)2011-11-192-3/+3
| * Improve some grid region log messages to express regions at co-ordinate (e.g....Justin Clark-Casey (justincc)2011-11-193-8/+21
| * improve region deregistration log messageJustin Clark-Casey (justincc)2011-11-191-1/+4
| * Don't register a region twice on both official registration and maptile regen...Justin Clark-Casey (justincc)2011-11-193-1/+6
* | Merge branch 'master' into bigmergeMelanie2011-11-173-28/+27
|\ \ | |/
| * distinguish between FriendsSimConnector and FriendsServiceConnector in logJustin Clark-Casey (justincc)2011-11-152-17/+17
| * Dont' bother with a userAgentService != null check right after we've construc...Justin Clark-Casey (justincc)2011-11-151-11/+10
* | Merge branch 'master' into bigmergeMelanie2011-11-111-0/+7
|\ \ | |/
| * Make log messages on authentication failure more explicitJustin Clark-Casey (justincc)2011-11-111-13/+26
* | Merge branch 'master' into bigmergeMelanie2011-11-061-1/+9
|\ \ | |/
| * Damaged assets, especially appearance textures, could crash the region server...Snoopy Pfeffer2011-11-061-1/+9