aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Connectors (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| * | HG: AAdded a few missing /'s at the end of URLsDiva Canto2011-12-233-1/+6
| | |
* | | Merge branch 'master' into careminsterMelanie2011-12-231-25/+56
|\ \ \ | | |/ | |/|
| * | Enables processing of hypergrid links through simiangrid services. ThanksMic Bowman2011-12-221-25/+56
| |/ | | | | | | otakup0pe
* | 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
| |
* | Merge branch 'master' into bigmergeMelanie2011-11-242-20/+49
|\ \ | |/
| * Append asset ID to URL for storage requests to allow caching proxies to work ↵Dan Lake2011-11-231-1/+3
| | | | | | | | with Simian
| * Improve the error messages returned if the HelloNeighbour call fails.Justin Clark-Casey (justincc)2011-11-211-19/+46
| | | | | | | | This is the message a region sends to its neighbours when it comes up
* | Merge branch 'master' into bigmergeMelanie2011-11-192-2/+4
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * Get rid of the spurious [WEB UTIL] couldn't decode <OpenSim agent ↵Justin Clark-Casey (justincc)2011-11-191-1/+1
| | | | | | | | | | | | | | 57956c4b-ff2e-4fc1-9995-613c6256cc98>: Invalid character 'O' in input string messages These are just the result of an attempt to canonicalize received messages - it's not important that we constantly log them. Also finally get the deregister grid service message working properly
| * Don't register a region twice on both official registration and maptile ↵Justin Clark-Casey (justincc)2011-11-191-1/+3
| | | | | | | | | | | | regeneration. Maptile storage appears orthogonal to region registration
* | Merge branch 'master' into bigmergeMelanie2011-11-172-17/+17
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
| * distinguish between FriendsSimConnector and FriendsServiceConnector in logJustin Clark-Casey (justincc)2011-11-152-17/+17
| |
* | Merge branch 'master' into bigmergeMelanie2011-11-041-1/+1
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs OpenSim/Region/CoreModules/LightShare/LightShareModule.cs OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
| * Drop the CopyTo parameter from Int32.MaxValue to 4096. This is a buffer sizeMic Bowman2011-11-021-1/+1
| | | | | | | | | | not a target size. Mono 2.10 appears to try to allocate the full buffer which immediately crashes. Tested on mono 2.6.7 and 2.10.5
* | 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
| |