| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | 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 | 2 | -4/+44 | |
| |\ \ | |/ | ||||||
| | * | HG: more / love for Xmas | Diva Canto | 2011-12-24 | 2 | -4/+44 | |
| | | | ||||||
| * | | Merge branch 'master' into careminster | Melanie | 2011-12-24 | 3 | -1/+6 | |
| |\ \ | |/ | ||||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2011-12-23 | 1 | -25/+56 | |
| | |\ | ||||||
| | * | | HG: AAdded a few missing /'s at the end of URLs | Diva Canto | 2011-12-23 | 3 | -1/+6 | |
| | | | | ||||||
| * | | | Merge branch 'master' into careminster | Melanie | 2011-12-23 | 1 | -25/+56 | |
| |\ \ \ | | |/ | |/| | ||||||
| | * | | Enables processing of hypergrid links through simiangrid services. Thanks | Mic Bowman | 2011-12-22 | 1 | -25/+56 | |
| | |/ | | | | | | | otakup0pe | |||||
| * | | 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 | |
| | | | ||||||
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-11-24 | 2 | -20/+49 | |
| |\ \ | |/ | ||||||
| | * | Append asset ID to URL for storage requests to allow caching proxies to work ↵ | Dan Lake | 2011-11-23 | 1 | -1/+3 | |
| | | | | | | | | | with Simian | |||||
| | * | Improve the error messages returned if the HelloNeighbour call fails. | Justin Clark-Casey (justincc) | 2011-11-21 | 1 | -19/+46 | |
| | | | | | | | | | This is the message a region sends to its neighbours when it comes up | |||||
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-11-19 | 2 | -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-19 | 1 | -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-19 | 1 | -1/+3 | |
| | | | | | | | | | | | | | regeneration. Maptile storage appears orthogonal to region registration | |||||
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-11-17 | 2 | -17/+17 | |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs | |||||
| | * | distinguish between FriendsSimConnector and FriendsServiceConnector in log | Justin Clark-Casey (justincc) | 2011-11-15 | 2 | -17/+17 | |
| | | | ||||||
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-11-04 | 1 | -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 size | Mic Bowman | 2011-11-02 | 1 | -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 bigmerge | Melanie | 2011-11-03 | 1 | -1/+1 | |
| |\ \ | |/ | ||||||
| | * | Revert "fix CopyTo call that was breaking under mono 2.10" | Melanie | 2011-11-03 | 1 | -1/+1 | |
| | | | | | | | | | This reverts commit d30971fdc243886b8fc614c7f869530db87e10f2. | |||||
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-11-03 | 1 | -1/+1 | |
| |\ \ | |/ | ||||||
| | * | fix CopyTo call that was breaking under mono 2.10 | Mic Bowman | 2011-11-02 | 1 | -1/+1 | |
| | | | ||||||
| * | | Merge commit '4c9400e6460a73baa2d687afe73a62c6efca9f37' into bigmerge | Melanie | 2011-10-25 | 2 | -0/+22 | |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs | |||||
| | * | Add optional getauthinfo and setauthinfo authentication service calls. | Justin Clark-Casey (justincc) | 2011-10-24 | 2 | -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 bigmerge | Melanie | 2011-10-12 | 1 | -1/+6 | |
| |\ \ | ||||||
| | * \ | Merge commit '1458fab82c4dab9901d81419e6b515f47ea7320f' into bigmerge | Melanie | 2011-10-11 | 1 | -1/+6 | |
| | |\ \ | | |/ | ||||||
| | | * | Reattaching a region was failing if the estate name had not changed (issue ↵ | Kevin Houlihan | 2011-09-16 | 1 | -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 bigmerge | Melanie | 2011-10-06 | 1 | -8/+61 | |
| |\ \ \ | |/ / |/| | | ||||||
| | * | | Change the asset connector to allow connection to different asset servers | Melanie | 2011-10-06 | 1 | -7/+61 | |
| | | | | | | | | | | | | | depending on the first two digits of the asset id. | |||||
| * | | | 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 | 6 | -48/+88 | |
| |\ \ \ | |/ / | | / | |/ |/| | ||||||
| | * | comment out some of the currently less useful debug log messages | Justin Clark-Casey (justincc) | 2011-08-11 | 1 | -1/+1 | |
| | | | ||||||
| | * | Get rid of AvatarAppearance.Owner to simplify the code. | Justin Clark-Casey (justincc) | 2011-08-02 | 2 | -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 Hurvitz | 2011-07-21 | 1 | -9/+49 | |
| | | | | | | | | | | | | | it once Signed-off-by: root <root@grid00001.t-data.com> | |||||
| | * | add test for resizing one part in a group | Justin Clark-Casey (justincc) | 2011-07-16 | 1 | -1/+0 | |
| | | | ||||||
| | * | 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-20 | 1 | -41/+40 | |
| |\ \ | |/ | ||||||
| | * | V2 map now working in grids too. WARNING: A few visible configuration ↵ | Diva Canto | 2011-06-13 | 1 | -41/+40 | |
| | | | | | | | | | variables added in order for this to work. See .ini.example changes | |||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-06-13 | 2 | -1/+159 | |
| |\ \ | |/ | ||||||
| | * | First pass at making the V2 map work. Standalones only for now. There are ↵ | Diva Canto | 2011-06-12 | 1 | -0/+158 | |
| | | | | | | | | | some issues with the zoom level -- TBD. | |||||
| | * | 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 | |||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |