| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | 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-22 | 1 | -0/+8 | |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||||
| | * | HG: Verify that the user is local | Diva Canto | 2011-12-21 | 1 | -0/+8 | |
| | | | ||||||
| * | | 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 | 5 | -4/+6 | |
| |\ \ | |/ | | | | | | | | | 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 | 4 | -4/+4 | |
| | | | ||||||
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-11-28 | 1 | -1/+1 | |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | |||||
| | * | minor: remove mono compiler warning | Justin Clark-Casey (justincc) | 2011-11-24 | 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 | 5 | -10/+31 | |
| |\ \ | |/ | | | | | | | | | 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 | 2 | -3/+3 | |
| | | | | | | | | | | | | | | | 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 | |||||
| | * | Improve some grid region log messages to express regions at co-ordinate ↵ | Justin Clark-Casey (justincc) | 2011-11-19 | 3 | -8/+21 | |
| | | | | | | | | | (e.g. 1000, 1000) rather than meter positions (256000, 256000) | |||||
| | * | improve region deregistration log message | Justin Clark-Casey (justincc) | 2011-11-19 | 1 | -1/+4 | |
| | | | ||||||
| | * | Don't register a region twice on both official registration and maptile ↵ | Justin Clark-Casey (justincc) | 2011-11-19 | 3 | -1/+6 | |
| | | | | | | | | | | | | | regeneration. Maptile storage appears orthogonal to region registration | |||||
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-11-17 | 3 | -28/+27 | |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs | |||||
| | * | distinguish between FriendsSimConnector and FriendsServiceConnector in log | Justin Clark-Casey (justincc) | 2011-11-15 | 2 | -17/+17 | |
| | | | ||||||
| | * | Dont' bother with a userAgentService != null check right after we've ↵ | Justin Clark-Casey (justincc) | 2011-11-15 | 1 | -11/+10 | |
| | | | | | | | | | constructed it | |||||
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-11-11 | 1 | -0/+7 | |
| |\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs | |||||
| | * | Make log messages on authentication failure more explicit | Justin Clark-Casey (justincc) | 2011-11-11 | 1 | -13/+26 | |
| | | | ||||||
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-11-06 | 1 | -1/+9 | |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | |||||
| | * | Damaged assets, especially appearance textures, could crash the region ↵ | Snoopy Pfeffer | 2011-11-06 | 1 | -1/+9 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | server with a fatal exception. Now, such excpetions are caught by an exception handler and just an error message is shown. This was the kind of exception causing these fatal server crashes: APPLICATION EXCEPTION DETECTED: System.UnhandledExceptionEventArgs^M ^M Exception: System.ArgumentOutOfRangeException: Argument is out of range. Parameter name: offset exceeds the size of buffer at System.Net.Sockets.NetworkStream.BeginRead (System.Byte[] buffer, Int32 offset, Int32 size, System.AsyncCallback callback, System.Object state) [0x00000] in <filename unknown>:0 at HttpServer.HttpClientContext.OnReceive (IAsyncResult ar) [0x00000] in <filename unknown>:0 ^M ^M Application is terminating: True^M | |||||
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-11-05 | 1 | -0/+3 | |
| |\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||||
| | * | Multiple lines in welcome message use '\n' in the welcome message to | nebadon | 2011-11-05 | 1 | -0/+3 | |
| | | | | | | | | | start a new line. | |||||
| * | | 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 | 4 | -1/+93 | |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs | |||||
| | * | Add optional getauthinfo and setauthinfo authentication service calls. | Justin Clark-Casey (justincc) | 2011-10-24 | 4 | -1/+94 | |
| | | | | | | | | | | | 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 commit 'c85a780583cb36bac95f69c5d704f60a758d56bb' into bigmerge | Melanie | 2011-10-25 | 1 | -3/+11 | |
| |\ \ | |/ | ||||||
| | * | Provide an option to allow remote calls to the CreateUser method on the ↵ | Justin Clark-Casey (justincc) | 2011-10-18 | 1 | -3/+11 | |
| | | | | | | | | | | | | | | | | | | | UserAccountService Default is false, as before. Enabling AllowCreateUser in [UserAccountService] for ROBUST allows avatars to be created via an http call, with viewer 2 appropriate bits and pieces. Only Ruths can be created at present. Please don't rely on the config since at some point CreateUser will be moved to a separate co-ordinating service. | |||||
| * | | Merge commit '730460169f2a45e934b42b2464f7c7472f7fac48' into bigmerge | Melanie | 2011-10-25 | 1 | -1/+0 | |
| |\ \ | |/ | ||||||
| | * | Bug fix on the bug fix on UserAccountService.cs | Diva Canto | 2011-10-16 | 1 | -1/+0 | |
| | | | ||||||
| * | | Merge commit 'bbd0e68c06b79acf0781d78e81fa292f549d676b' into bigmerge | Melanie | 2011-10-25 | 1 | -0/+3 | |
| |\ \ | |/ | ||||||
| | * | Guard HGAssetService against uninitialized variables and null arguments. | Diva Canto | 2011-10-15 | 1 | -0/+3 | |
| | | | ||||||
| * | | Merge commit '83c7b9b609d3c78d099a0bf18de8685676184f94' into bigmerge | Melanie | 2011-10-25 | 1 | -46/+44 | |
| |\ \ | |/ | ||||||
| | * | Bug fix -- Test User on first run standalone might not be created properly: ↵ | Diva Canto | 2011-10-13 | 1 | -46/+44 | |
| | | | | | | | | | let all instances of UserAccountService have all its service references properly initialized, and register console commands on only one. | |||||
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-10-12 | 1 | -0/+7 | |
| |\ \ | |/ | ||||||
 |
index : opensim-SC_OLD | |
| My fork of OpenSim for IG and MG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |