aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Connectors (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
* | 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
| | | | | | | | This reverts commit d30971fdc243886b8fc614c7f869530db87e10f2.
* | 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-252-0/+22
|\ \ | |/ | | | | | | Conflicts: OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs
| * Add optional getauthinfo and setauthinfo authentication service calls.Justin Clark-Casey (justincc)2011-10-242-0/+22
| | | | | | | | | | These are disabled by default, as before. Please only turn these on in secure grids, since they allow the same facilities as the existing SetPassword call (also disabled by default) These facilities can be helpful when integrating external systems, in addition to the existing option of adapting an IAuthenticationService or using WebLoginKey
* | Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmergeMelanie2011-10-121-1/+6
|\ \
| * \ Merge commit '1458fab82c4dab9901d81419e6b515f47ea7320f' into bigmergeMelanie2011-10-111-1/+6
| |\ \ | | |/
| | * Reattaching a region was failing if the estate name had not changed (issue ↵Kevin Houlihan2011-09-161-1/+6
| | | | | | | | | | | | | | | | | | 5035). Using the RemoteAdmin API to close then recreate a region would fail if the estate name had not changed. If the estate name /was/ changed then the existing estate would be renamed rather than a new one being created. The problem really arose from a lack of distinction in the data storage layer between creating new estates and loading existing ones.
* | | Merge branch 'careminster-presence-refactor' into bigmergeMelanie2011-10-061-8/+61
|\ \ \ | |/ / |/| |
| * | Change the asset connector to allow connection to different asset serversMelanie2011-10-061-7/+61
| | | | | | | | | | | | depending on the first two digits of the asset id.
* | | 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-046-48/+88
|\ \ \ | |/ / | | / | |/ |/|
| * 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-022-3/+3
| | | | | | | | This is not used for anything - appearances are always properties of objects with ids (ScenePresence, AgentCircuitData) and just has the potential to get out of sync when the appearance is cloned.
| * When an uncached asset is requested multiple times concurrently, only load ↵Oren Hurvitz2011-07-211-9/+49
| | | | | | | | | | | | it once Signed-off-by: root <root@grid00001.t-data.com>
| * add test for resizing one part in a groupJustin Clark-Casey (justincc)2011-07-161-1/+0
| |
| * minor: remove mono compiler warningsJustin Clark-Casey (justincc)2011-07-161-35/+36
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-06-201-41/+40
|\ \ | |/
| * V2 map now working in grids too. WARNING: A few visible configuration ↵Diva Canto2011-06-131-41/+40
| | | | | | | | variables added in order for this to work. See .ini.example changes
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-06-132-1/+159
|\ \ | |/
| * First pass at making the V2 map work. Standalones only for now. There are ↵Diva Canto2011-06-121-0/+158
| | | | | | | | some issues with the zoom level -- TBD.
| * 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-096-18/+747
|\ \ | |/
| * 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
| * HG IM: increase the timeout valueDiva Canto2011-06-021-1/+1
| |
| * HG Friends bug fix: connector was shrinking principalID to UUID.Diva Canto2011-06-021-12/+12
| |
| * Fixed an issue with the response of CreateAgent over the SimulationConnector.Diva Canto2011-05-281-6/+21
| |
| * HG lures working! Friends can offer friends HG teleports via the profile. ↵Diva Canto2011-05-271-0/+1
| | | | | | | | WARNING: additional configuration for HG inis -- see *Common.ini.example
| * Commented a few extra debug messages.Diva Canto2011-05-262-4/+2
| |
| * HG IM in grid mode working fairly well. Unknown target user references ↵Diva Canto2011-05-262-0/+62
| | | | | | | | 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-252-0/+187
| | | | | | | | 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-223-1/+71
| | | | | | | | 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-213-32/+40
| | | | | | | | 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-193-4/+186
| | | | | | | | correctly handled. Friends list showing correct foreign names. TODO: GrantRights.
| * Also compress the actual fatpacksMelanie2011-05-081-1/+6
| |
| * Enable compressed (gzip) fatpack transfers.Melanie2011-05-081-5/+14
| |
* | Also compress the actual fatpacksMelanie2011-05-081-1/+6
| |
* | Enable compressed (gzip) fatpack transfers.Melanie2011-05-081-5/+14
| |
* | Attempt to make teleports more reliable. This may break redirection on loginMelanie2011-05-031-1/+1
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-05-032-17/+20
|\ \ | |/
| * Increased timeout for fat UpdateAgent to 200secs. Nebadon's 3800-prim alien ↵Diva Canto2011-05-021-1/+1
| | | | | | | | avatar takes 6secs to transfer between sims on the same machine...
| * Oops, forgot this one.Diva Canto2011-05-021-1/+1
| |
| * Turns out that it's a bad idea to let Agent position updates linger for a ↵Diva Canto2011-05-021-7/+7
| | | | | | | | long time on certain versions of mono. It's better to abort them if they take too long. So timeout is now an argument. Currently: 20secs for CreateAgent, 100secs for UpdateAgent (fat), 10 secs for UpdateAgent (Position); all of these divided by 4, for ReadWrite, as Mic had before.