aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-03-231-11/+13
|\
| * Comment out login parameters debug output accidentally included with c4b2d24Justin Clark-Casey (justincc)2012-03-221-11/+13
* | Merge commit '760010d6fb6aac313d79ce0a4d0016d3809246a0' into careminsterMelanie2012-03-222-1/+12
|\ \ | |/
| * Add llGiveInventory() test from object to object where both objects are owned...Justin Clark-Casey (justincc)2012-03-222-1/+12
* | Merge branch 'master' into careminsterMelanie2012-03-222-1/+57
|\ \ | |/
| * HG Friends: reroute the status notifications to the HGFriends service, so tha...Diva Canto2012-03-212-0/+57
| * Removed extraneous debug messageDiva Canto2012-03-211-1/+0
* | Merge branch 'master' into careminsterMelanie2012-03-213-59/+163
|\ \ | |/
| * HG Friends: allow the establishment of HG friendships without requiring co-pr...Diva Canto2012-03-203-57/+133
| * Added GetUUID(first, last) on UserAgentsService so that we can finally make d...Diva Canto2012-03-171-2/+30
* | Merge branch 'master' into careminsterMelanie2012-03-141-7/+12
|\ \ | |/
| * Minor sanity check on simulation agent handler (content type)Diva Canto2012-03-131-7/+12
* | Merge branch 'master' into careminsterMelanie2012-03-082-7/+7
|\ \ | |/
| * Change "help" to display categories/module list then "help <category/module>"...Justin Clark-Casey (justincc)2012-03-082-7/+7
* | Merge branch 'master' into careminsterMelanie2012-03-041-1/+1
|\ \ | |/
| * OpenID auth needs hashing before authenticatingBlueWall2012-03-021-1/+1
* | Merge branch 'master' into careminsterMelanie2012-02-231-3/+7
|\ \ | |/
| * Add a position parameter to region crossing of objects. This avoids theMelanie2012-02-231-3/+7
* | Merge branch 'master' into careminsterMelanie2012-02-021-1/+1
|\ \ | |/
| * OpenID: server connector had a copy-and-paste error that made identity querie...Diva Canto2012-02-021-1/+1
* | Merge branch 'master' into careminsterMelanie2012-01-251-4/+3
|\ \ | |/
| * Make errors reported by OpenSim when it halts because it can't find certain c...Justin Clark-Casey (justincc)2012-01-241-4/+3
* | Merge branch 'master' into careminsterMelanie2012-01-212-1/+53
|\ \ | |/
| * Change URI to lowercase to match existingBlueWall2012-01-191-1/+1
| * Add fetching of SRV_HomeURI to "/json_grid_info"BlueWall2012-01-191-1/+36
| * Merge branch 'master' of /home/opensim/lib/osgrid/opensimBlueWall2012-01-172-0/+17
| |\
| | * Add json handler for GridInfoBlueWall2012-01-172-0/+17
| * | Allow retrival of multiple user records in one operation, analog to presenceMelanie2012-01-161-0/+42
| |/
* | Add methods to allow the groups modules to query online status and last loginMelanie2012-01-161-0/+42
* | 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