Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster | Melanie | 2012-03-22 | 1 | -0/+1 |
|\ | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Land/LandObject.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| * | HG Friends: reroute the status notifications to the HGFriends service, so ↵ | Diva Canto | 2012-03-21 | 1 | -0/+1 |
| | | | | | | | | that they can scale better. They were previously being handled by the UAS; that is still there, but it's now obsolete and will be removed in a future release. | ||||
* | | Merge branch 'master' into careminster | Melanie | 2012-03-21 | 1 | -1/+60 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | ||||
| * | Added GetUUID(first, last) on UserAgentsService so that we can finally make ↵ | Diva Canto | 2012-03-17 | 1 | -1/+60 |
| | | | | | | | | direct user connections. | ||||
* | | 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 | 1 | -0/+3 |
|\ \ | |/ | | | | | | | | | | | | | 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 | 1 | -0/+3 |
| | | | | | | | | on get_agent_home in UAS. | ||||
* | | 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 | 1 | -1/+1 |
|\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| * | 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 | 1 | -0/+323 |
|\ \ | |/ | |||||
| * | 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. | ||||
| * | Canonicalize URL endings for the UserAgentServiceConnector. | Diva Canto | 2011-01-06 | 1 | -1/+5 |
|/ | |||||
* | Normalized ALL URLs with trailing /'s hopefully. Fixed show hyperlinks ↵ | Diva Canto | 2010-12-09 | 1 | -1/+1 |
| | | | | command. mantis #5259 | ||||
* | * change the data exchanged within hypergrid transactions | Jonathan Freedman | 2010-10-21 | 1 | -0/+2 |
| | |||||
* | Added viewer's channel, mac, and id0 to agent circuit data. Also moved ↵ | Diva Canto | 2010-10-03 | 1 | -2/+6 |
| | | | | client ip address to agent circuit data, so that it's always there. | ||||
* | One more debug message to track an issue on Danger grid. | Diva Canto | 2010-09-04 | 1 | -0/+1 |
| | |||||
* | Make User Agent Service and Login Service separable. | Diva Canto | 2010-09-04 | 1 | -10/+32 |
| | |||||
* | Quick fix for making global references for gatekeepers that are not ↵ | Diva Canto | 2010-09-02 | 1 | -3/+4 |
| | | | | domain:port work. This needs a serious rewrite, as the assumption domain:port doesn't hold from here on. Just quick-fixing for now. | ||||
* | Remove various warnings and improve logging messages. No functional changes. | Justin Clark-Casey (justincc) | 2010-08-23 | 1 | -5/+2 |
| | |||||
* | Partial rewrite of client IP verification. Not completely finished yet, and ↵ | Diva Canto | 2010-08-19 | 1 | -0/+7 |
| | | | | untested. Committing to move to my other computer. | ||||
* | Fixes mantis #4954 for the xml-rpc calls of the UserAgentServiceConnector. ↵ | Diva Canto | 2010-08-16 | 1 | -2/+13 |
| | | | | Basically, let's not let the xml-rpc library do the DNS conversion... | ||||
* | Better debug messages | Diva Canto | 2010-08-04 | 1 | -5/+19 |
| | |||||
* | Finalized the client's TCP IP address verification process for HG1.5. | Diva Canto | 2010-05-15 | 1 | -0/+5 |
| | |||||
* | Formatting cleanup. Add copyright notices. | Jeff Ames | 2010-03-10 | 1 | -1/+28 |
| | |||||
* | Changed a cryptic debug message and a wrong comment | Diva Canto | 2010-03-09 | 1 | -1/+1 |
| | |||||
* | HG 1.5 is in place. Tested in standalone only. | Diva Canto | 2010-01-28 | 1 | -0/+370 |