aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Connectors/SimianGrid (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-11-171-1/+0
|\
| * Remove unnecessary ability to directly set InventoryItemBase.CreatorIdAsUuidJustin Clark-Casey (justincc)2012-11-171-1/+0
* | Merge branch 'master' into careminsterMelanie2012-11-137-7/+7
|\ \ | |/
| * Cleanup on region modules: gave short node id's to all of them.Diva Canto2012-11-127-7/+7
* | Merge branch 'master' into careminsterMelanie2012-10-121-2/+2
|\ \ | |/
| * Move OpenSim.Data.RegionFlags -> OpenSim.Framework.RegionFlags to make it eas...Justin Clark-Casey (justincc)2012-10-091-2/+2
| * Revert "Added request.Proxy=null everywhere, as discussed in http://stackover...Diva Canto2012-09-302-6/+1
| * Added request.Proxy=null everywhere, as discussed in http://stackoverflow.com...Diva Canto2012-09-302-1/+6
* | Merge branch 'master' into careminsterMelanie2012-09-091-2/+2
|\ \ | |/
| * 4096 is used in various places as the maximum height of a region, refactoring...SignpostMarv2012-09-081-2/+2
* | fix vs2010 buildUbitUmarov2012-08-161-0/+1
* | Add a real_id field to the login response if impersonation is used. The wrapperMelanie2012-08-151-0/+5
* | Merge branch 'master' into careminsterMelanie2012-06-121-21/+7
|\ \ | |/
| * OnConnectionClosed listeners, retrieve data from IClientAPI.SceneAgent rather...Justin Clark-Casey (justincc)2012-06-121-21/+7
* | Merge branch 'master' into careminsterMelanie2012-03-141-1/+1
|\ \ | |/
| * Rename the stream extension method WebUtil.CopyTo() to WebUtil.CopyStream().Robert Adams2012-03-121-1/+1
| * Allow retrival of multiple user records in one operation, analog to presenceMelanie2012-01-161-0/+4
* | Add methods to allow the groups modules to query online status and last loginMelanie2012-01-161-0/+4
* | Merge branch 'master' into careminsterMelanie2012-01-021-0/+4
|\ \ | |/
| * Set the local grid flag in the user account through the simian connectorMic Bowman2011-12-291-0/+4
* | Merge branch 'master' into careminsterMelanie2011-12-242-0/+5
|\ \ | |/
| * 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-232-0/+5
* | | 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 bigmergeMelanie2011-11-241-1/+3
|\ \ | |/
| * Append asset ID to URL for storage requests to allow caching proxies to work ...Dan Lake2011-11-231-1/+3
* | 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-251-0/+10
|\ \ | |/
| * Add optional getauthinfo and setauthinfo authentication service calls.Justin Clark-Casey (justincc)2011-10-241-0/+10
* | Resolve merge commits, stage 1Tom2011-09-042-3/+3
|\ \ | |/
| * comment out some of the currently less useful debug log messagesJustin Clark-Casey (justincc)2011-08-111-1/+1
| * Get rid of AvatarAppearance.Owner to simplify the code.Justin Clark-Casey (justincc)2011-08-021-2/+2
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-06-091-4/+21
|\ \ | |/
| * More on HG Friends. Added Delete(string, string) across the board. Added secu...Diva Canto2011-05-221-1/+6
| * Fixed permissions bug related to friends in PermissionsModule. Added FriendsD...Diva Canto2011-05-211-3/+15
| * HG Friends working to some extent: friendships offered and accepted correctly...Diva Canto2011-05-191-1/+1
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-02-071-0/+262
|\ \ | |/
| * Convert SimianMaptile refresh time from ms to seconds. Too many 0'sMic Bowman2011-02-041-11/+12
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-01-184-23/+22
|\ \ | |/
| * minor: remove mono compiler warningsJustin Clark-Casey (justincc)2011-01-181-2/+2
| * Reduce amount of debug lopgging put out by some simiangrid connectors. Pleas...Justin Clark-Casey (justincc)2011-01-184-21/+20
| * Moved the map tile processing used by the Simian GridMic Bowman2011-01-082-86/+261
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-01-062-4/+2
|\ \ | |/
| * comment out a couple simian debug messagesMic Bowman2011-01-052-4/+2