Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster | Melanie | 2012-02-07 | 1 | -6/+9 |
|\ | |||||
| * | Add url to logging if SynchronousRestFormsRequester.MakRequest() throws an ↵ | Justin Clark-Casey (justincc) | 2012-02-07 | 1 | -6/+9 |
| | | | | | | | | exception in service connectors | ||||
* | | Merge branch 'master' into careminster | Melanie | 2012-01-07 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | minor: remove mono compiler warning | Justin Clark-Casey (justincc) | 2012-01-07 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2012-01-05 | 1 | -0/+54 |
|\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | ||||
| * | Profile Updates | BlueWall | 2012-01-03 | 1 | -0/+54 |
| | | | | | | | | Update basic profile to use the replaceable interface, making configuration less error-prone. Add support to query avatar's home user account and profile service for regions usng the updated OpenProfileModule with Hypergrid. | ||||
* | | Merge branch 'master' into careminster | Melanie | 2012-01-02 | 2 | -1/+4 |
|\ \ | |/ | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs OpenSim/Services/Interfaces/IUserAccountService.cs | ||||
| * | HG: more adjustments for making HG Simian work. Added server_uri as new key ↵ | Diva Canto | 2011-12-29 | 2 | -1/+4 |
| | | | | | | | | on get_agent_home in UAS. | ||||
* | | Merge branch 'master' into careminster | Melanie | 2011-12-28 | 1 | -2/+25 |
|\ \ | |/ | |||||
| * | HG: more / love for Xmas | Diva Canto | 2011-12-24 | 1 | -2/+25 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2011-12-24 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | HG: AAdded a few missing /'s at the end of URLs | Diva Canto | 2011-12-23 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2011-12-18 | 1 | -0/+1 |
|\ \ | |/ | |||||
| * | HG minor bug fix and marked one method obsolete in UAS. | Diva Canto | 2011-12-16 | 1 | -0/+1 |
| | | |||||
* | | Merge branch 'master' into bigmerge | Melanie | 2011-12-05 | 2 | -1/+3 |
|\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| * | HG: Added HEAD method to Helo service. This is the preferred method, but its ↵ | Diva Canto | 2011-12-04 | 1 | -0/+2 |
| | | | | | | | | wide use will have to wait a few releases. So the sims are still calling GET for now. | ||||
| * | HG: Renamed one method | Diva Canto | 2011-12-04 | 1 | -1/+1 |
| | | |||||
* | | Bring us up to date. | Tom | 2011-09-14 | 1 | -12/+12 |
|\ \ | |/ | |||||
| * | Increase information in logging for UserAgentServiceConnector. | Justin Clark-Casey (justincc) | 2011-09-08 | 1 | -12/+12 |
| | | | | | | | | Done for http://opensimulator.org/mantis/view.php?id=5669 | ||||
* | | Resolve merge commits, stage 1 | Tom | 2011-09-04 | 1 | -35/+36 |
|\ \ | |/ | |||||
| * | minor: remove mono compiler warnings | Justin Clark-Casey (justincc) | 2011-07-16 | 1 | -35/+36 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-06-13 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Only send AgentOnline to the client if the friendsOnline list has elements. ↵ | Diva Canto | 2011-06-11 | 1 | -1/+1 |
| | | | | | | | | Also, increased the timeout on UserAgentServiceConnector, StatusNotification again. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-06-11 | 1 | -12/+23 |
|\ \ | |/ | |||||
| * | More tweaking on the UserAgentServiceConnector: add constructor that does ↵ | Diva Canto | 2011-06-10 | 1 | -13/+22 |
| | | | | | | | | not do DNS lookup, and use that for friends notification. | ||||
| * | Decreased timeout of HG StatusNotification to 4secs. ↵ | Diva Canto | 2011-06-10 | 1 | -1/+1 |
| | | | | | | | | http://opensimulator.org/mantis/view.php?id=5516 | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-06-09 | 2 | -0/+529 |
|\ \ | |/ | |||||
| * | This hopefully fixes all issues with online/offline notifications across ↵ | Diva Canto | 2011-06-07 | 1 | -2/+53 |
| | | | | | | | | grids. http://opensimulator.org/mantis/view.php?id=5528 | ||||
| * | Commented a few extra debug messages. | Diva Canto | 2011-05-26 | 1 | -2/+0 |
| | | |||||
| * | HG IM in grid mode working fairly well. Unknown target user references ↵ | Diva Canto | 2011-05-26 | 1 | -0/+61 |
| | | | | | | | | looked back in source user's User Agent service. | ||||
| * | HG: Instant Message working. Tested on HG standalones only. Needs a lot more ↵ | Diva Canto | 2011-05-25 | 1 | -0/+58 |
| | | | | | | | | testing. | ||||
| * | Added necessary code to drop inventory on hg friends using the profile ↵ | Diva Canto | 2011-05-24 | 1 | -1/+65 |
| | | | | | | | | window, but can't test because this mechanism doesn't seem to work without a profile service. | ||||
| * | HG friends: Status notifications working. Also initial logins get the online ↵ | Diva Canto | 2011-05-23 | 1 | -0/+91 |
| | | | | | | | | friends in other grids. | ||||
| * | More on HG Friends. Added Delete(string, string) across the board. Added ↵ | Diva Canto | 2011-05-22 | 1 | -0/+50 |
| | | | | | | | | security to friendship identifiers so that they can safely be deleted across worlds. Had to change Get(string) to use LIKE because the secret in the identifier is not always known -- affects only HG visitors. BOTTOM LINE SO FAR: HG friendships established and deleted safely across grids, local rights working but not (yet?) being transmitted back. | ||||
| * | Fixed permissions bug related to friends in PermissionsModule. Added ↵ | Diva Canto | 2011-05-21 | 1 | -28/+9 |
| | | | | | | | | FriendsData[] GetFriends(string principalID) to IFriendsData and FriendInfo[] GetFriends(string PrincipalID) to IFriendsService. Refactored some more in the FriendsModule. Made client get notification of local friends permissions upon HGLogin. HG Friends object permissions work. | ||||
| * | HG Friends working to some extent: friendships offered and accepted ↵ | Diva Canto | 2011-05-19 | 1 | -0/+175 |
| | | | | | | | | correctly handled. Friends list showing correct foreign names. TODO: GrantRights. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-05-03 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Oops, forgot this one. | Diva Canto | 2011-05-02 | 1 | -1/+1 |
| | | |||||
| * | Canonicalize URL endings for the UserAgentServiceConnector. | Diva Canto | 2011-01-06 | 1 | -1/+5 |
| | | |||||
| * | HG map tile fetch: handle cached images appropriately. | Diva Canto | 2011-01-06 | 1 | -4/+12 |
|/ | |||||
* | Cleaned up debugging messages in the WebRequest handlers | Mic Bowman | 2011-01-03 | 1 | -1/+1 |
| | |||||
* | Standardize the way WebRequests are made in the SimulationServiceConnector. ↵ | Mic Bowman | 2010-12-29 | 1 | -29/+35 |
| | | | | | | Added debugging calls for tracking performance of web requests. | ||||
* | More on mantis #5270 | Diva Canto | 2010-12-14 | 1 | -2/+3 |
| | |||||
* | Changed logging level for message about failure to retrieve a map image from ↵ | Marck | 2010-12-13 | 1 | -1/+1 |
| | | | | a linked region. | ||||
* | Show map tile for hyperlinks. Perform Check4096 before adding a hyperlink. | Marck | 2010-12-13 | 1 | -14/+15 |
| | | | | | | Configuration option AssetService in section [GridService] must be set to enable this functionality. Map tiles do currently not show for hyperlinks set in simulators that are connected to grids, see Mantis #5270. | ||||
* | Normalized ALL URLs with trailing /'s hopefully. Fixed show hyperlinks ↵ | Diva Canto | 2010-12-09 | 1 | -1/+1 |
| | | | | command. mantis #5259 | ||||
* | Fixed some inconsistency with trailing /. Made debug messages consistent. ↵ | Diva Canto | 2010-12-05 | 1 | -14/+14 |
| | | | | Changed the stored region names of HG regions. Increased the size of regionName in DB. | ||||
* | * change the data exchanged within hypergrid transactions | Jonathan Freedman | 2010-10-21 | 2 | -14/+23 |
| | |||||
* | * remove some spurious debug info | Jonathan Freedman | 2010-10-20 | 1 | -15/+15 |
| | |||||
* | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-05 | 1 | -2/+6 |
|\ |