aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-01-061-1/+128
|\
| * Make "show asset" command available simulator side. Actually make the servic...Justin Clark-Casey (justincc)2012-01-051-5/+5
| * Add size and temporary information to "show asset" commandJustin Clark-Casey (justincc)2012-01-051-0/+2
| * Rename 'show digest' console command to 'show asset'Justin Clark-Casey (justincc)2012-01-051-1/+1
| * Move asset commands from AssetService to AssetServerConnector so that we can ...Justin Clark-Casey (justincc)2012-01-051-1/+126
* | Merge branch 'master' into careminsterMelanie2012-01-051-0/+33
|\ \ | |/
| * Profile UpdatesBlueWall2012-01-031-0/+33
* | Merge branch 'master' into careminsterMelanie2012-01-021-1/+1
|\ \ | |/
| * Fixed mix-up in UserAccount fields when passing UserAccounts remotely.Diva Canto2011-12-291-1/+1
* | 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-0522-29/+29
|\ \ | |/
| * Implement IOSHttpRequest and IOSHttpResponse http interfaces and use instead ...Justin Clark-Casey (justincc)2011-12-0522-29/+29
* | Merge branch 'master' into bigmergeMelanie2011-12-052-2/+34
|\ \ | |/
| * HG: Added HEAD method to Helo service. This is the preferred method, but its ...Diva Canto2011-12-041-1/+33
| * HG: Renamed one methodDiva Canto2011-12-041-1/+1
* | Merge branch 'master' into bigmergeMelanie2011-11-194-13/+16
|\ \ | |/
| * Remove the "[LOCAL SIMULATION CONNECTOR]: Did not find region {0} for SendCre...Justin Clark-Casey (justincc)2011-11-191-2/+2
| * Get rid of the spurious [WEB UTIL] couldn't decode <OpenSim agent 57956c4b-ff...Justin Clark-Casey (justincc)2011-11-191-2/+1
| * Remove mono compiler warnings. Fix problem with co-ordinate given in deregis...Justin Clark-Casey (justincc)2011-11-192-4/+4
| * Improve some grid region log messages to express regions at co-ordinate (e.g....Justin Clark-Casey (justincc)2011-11-191-5/+9
* | Merge branch 'master' into bigmergeMelanie2011-11-031-1/+8
|\ \ | |/
| * Catch any exceptions exiting the top of the robust console, as we already do ...Justin Clark-Casey (justincc)2011-11-021-1/+8
* | Merge branch 'master' into bigmergeMelanie2011-10-262-1/+3
|\ \ | |/
| * Make OpenSim.Framework.Servers.HttpServer rely on OpenSim.Framework instead o...Justin Clark-Casey (justincc)2011-10-252-1/+3
* | Merge commit '4c9400e6460a73baa2d687afe73a62c6efca9f37' into bigmergeMelanie2011-10-252-3/+73
|\ \ | |/
| * Add optional getauthinfo and setauthinfo authentication service calls.Justin Clark-Casey (justincc)2011-10-242-3/+73
* | Merge commit 'd9184eceab5ff9087801b0f0d447dec2f5227a50' into bigmergeMelanie2011-10-252-23/+46
|\ \ | |/
| * Add option to allow remote http calls to setpassword in the AuthenticationSer...Justin Clark-Casey (justincc)2011-10-192-23/+46
* | Merge commit '4cffdf15ba320b71650ade9edddec2286b1c5258' into bigmergeMelanie2011-10-251-11/+6
|\ \ | |/
| * Make ScopeID optional for http GetAccount and GetAccountsJustin Clark-Casey (justincc)2011-10-191-11/+6
* | Merge commit '9f171041c950d55d86481cdcee7a04c623bea8b2' into bigmergeMelanie2011-10-251-0/+6
|\ \ | |/
| * Make PrincipalID a synonym for UserID in GetUserAccountJustin Clark-Casey (justincc)2011-10-191-0/+6
* | Merge commit '97c66f8eac648229b55ba5a000d57e4b9377c663' into bigmergeMelanie2011-10-251-3/+3
|\ \ | |/
| * Get new NewUser and SetUserAccount calls to accept PrincipalID instead of Use...Justin Clark-Casey (justincc)2011-10-191-3/+3
* | Merge commit '9d59b285bbc84aa620200e7da69be0f347dd69f4' into bigmergeMelanie2011-10-251-3/+59
|\ \ | |/
| * Allow an http call to set account details if AllowSetAccount = true in [UserA...Justin Clark-Casey (justincc)2011-10-191-3/+59
* | Merge commit 'c85a780583cb36bac95f69c5d704f60a758d56bb' into bigmergeMelanie2011-10-252-4/+62
|\ \ | |/
| * Provide an option to allow remote calls to the CreateUser method on the UserA...Justin Clark-Casey (justincc)2011-10-182-4/+62
* | Merge commit '631d5e16ef8c5340b6283b1a9ed9cc95aea3e3a1' into bigmergeMelanie2011-10-251-13/+5
|\ \ | |/
| * Get rid of some traces of the old pre-ROBUST grid architecture configJustin Clark-Casey (justincc)2011-10-121-13/+5
* | Resolve merge commits, stage 1Tom2011-09-041-1/+1
|\ \ | |/
| * Pass the first name and last name from the agent circuit data to the authoriz...Justin Clark-Casey (justincc)2011-07-231-1/+1
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-06-202-2/+123
|\ \ | |/
| * V2 map now working in grids too. WARNING: A few visible configuration variabl...Diva Canto2011-06-132-2/+123
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-06-132-0/+167
|\ \ | |/
| * bit depth: 24!!! begeez! -- zoom levels work now.Diva Canto2011-06-121-1/+3
| * A few bug fixes on map V2. Zoom level weirdness still there.Diva Canto2011-06-121-3/+2
| * First pass at making the V2 map work. Standalones only for now. There are som...Diva Canto2011-06-122-0/+166
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-06-097-9/+926
|\ \ | |/
generated by cgit v1.1 at 2024-11-08 06:11:30 +0000