aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Connectors/Hypergrid (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-01-071-1/+1
|\
| * minor: remove mono compiler warningJustin Clark-Casey (justincc)2012-01-071-1/+1
| |
* | Merge branch 'master' into careminsterMelanie2012-01-051-0/+54
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * Profile UpdatesBlueWall2012-01-031-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 careminsterMelanie2012-01-022-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 Canto2011-12-292-1/+4
| | | | | | | | on get_agent_home in UAS.
* | Merge branch 'master' into careminsterMelanie2011-12-281-2/+25
|\ \ | |/
| * HG: more / love for XmasDiva Canto2011-12-241-2/+25
| |
* | Merge branch 'master' into careminsterMelanie2011-12-241-1/+1
|\ \ | |/
| * HG: AAdded a few missing /'s at the end of URLsDiva Canto2011-12-231-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-052-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 Canto2011-12-041-0/+2
| | | | | | | | wide use will have to wait a few releases. So the sims are still calling GET for now.
| * HG: Renamed one methodDiva Canto2011-12-041-1/+1
| |
* | Bring us up to date.Tom2011-09-141-12/+12
|\ \ | |/
| * Increase information in logging for UserAgentServiceConnector.Justin Clark-Casey (justincc)2011-09-081-12/+12
| | | | | | | | Done for http://opensimulator.org/mantis/view.php?id=5669
* | Resolve merge commits, stage 1Tom2011-09-041-35/+36
|\ \ | |/
| * minor: remove mono compiler warningsJustin Clark-Casey (justincc)2011-07-161-35/+36
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-06-131-1/+1
|\ \ | |/
| * Only send AgentOnline to the client if the friendsOnline list has elements. ↵Diva Canto2011-06-111-1/+1
| | | | | | | | Also, increased the timeout on UserAgentServiceConnector, StatusNotification again.
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-06-111-12/+23
|\ \ | |/
| * More tweaking on the UserAgentServiceConnector: add constructor that does ↵Diva Canto2011-06-101-13/+22
| | | | | | | | not do DNS lookup, and use that for friends notification.
| * Decreased timeout of HG StatusNotification to 4secs. ↵Diva Canto2011-06-101-1/+1
| | | | | | | | http://opensimulator.org/mantis/view.php?id=5516
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-06-092-0/+529
|\ \ | |/
| * This hopefully fixes all issues with online/offline notifications across ↵Diva Canto2011-06-071-2/+53
| | | | | | | | grids. http://opensimulator.org/mantis/view.php?id=5528
| * Commented a few extra debug messages.Diva Canto2011-05-261-2/+0
| |
| * HG IM in grid mode working fairly well. Unknown target user references ↵Diva Canto2011-05-261-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 Canto2011-05-251-0/+58
| | | | | | | | testing.
| * Added necessary code to drop inventory on hg friends using the profile ↵Diva Canto2011-05-241-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 Canto2011-05-231-0/+91
| | | | | | | | friends in other grids.
| * More on HG Friends. Added Delete(string, string) across the board. Added ↵Diva Canto2011-05-221-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 Canto2011-05-211-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 Canto2011-05-191-0/+175
| | | | | | | | correctly handled. Friends list showing correct foreign names. TODO: GrantRights.
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-05-031-1/+1
|\ \ | |/
| * Oops, forgot this one.Diva Canto2011-05-021-1/+1
| |
| * Canonicalize URL endings for the UserAgentServiceConnector.Diva Canto2011-01-061-1/+5
| |
| * HG map tile fetch: handle cached images appropriately.Diva Canto2011-01-061-4/+12
|/
* Cleaned up debugging messages in the WebRequest handlersMic Bowman2011-01-031-1/+1
|
* Standardize the way WebRequests are made in the SimulationServiceConnector. ↵Mic Bowman2010-12-291-29/+35
| | | | | | Added debugging calls for tracking performance of web requests.
* More on mantis #5270Diva Canto2010-12-141-2/+3
|
* Changed logging level for message about failure to retrieve a map image from ↵Marck2010-12-131-1/+1
| | | | a linked region.
* Show map tile for hyperlinks. Perform Check4096 before adding a hyperlink.Marck2010-12-131-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 Canto2010-12-091-1/+1
| | | | command. mantis #5259
* Fixed some inconsistency with trailing /. Made debug messages consistent. ↵Diva Canto2010-12-051-14/+14
| | | | Changed the stored region names of HG regions. Increased the size of regionName in DB.
* * change the data exchanged within hypergrid transactionsJonathan Freedman2010-10-212-14/+23
|
* * remove some spurious debug infoJonathan Freedman2010-10-201-15/+15
|
* Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-051-2/+6
|\
| * Added viewer's channel, mac, and id0 to agent circuit data. Also moved ↵Diva Canto2010-10-031-2/+6
| | | | | | | | client ip address to agent circuit data, so that it's always there.
* | * additional serveruri cleanupJonathan Freedman2010-10-031-8/+6
| |