Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster | Melanie | 2012-04-25 | 1 | -13/+18 |
|\ | | | | | | | | | Conflicts: OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs | ||||
| * | Go back to always using the local timezone for now - not all machines have ↵ | Justin Clark-Casey (justincc) | 2012-04-24 | 1 | -13/+18 |
| | | | | | | | | | | | | US/Pacific or Olsen Amercia/Los_Angeles and this introduces variability that the server operator cannot control Please see http://opensimulator.org/mantis/view.php?id=5972 soon for more comments. | ||||
* | | Merge branch 'master' into careminster | Melanie | 2012-04-24 | 1 | -1/+20 |
|\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Warp3DMap/MapImageModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| * | minor: formatting changes to top of LLLoginResponse.SetDefaultValues(), ↵ | Justin Clark-Casey (justincc) | 2012-04-24 | 1 | -1/+6 |
| | | | | | | | | chiefly some break up of the long line. | ||||
| * | DST settings to match client default Pacific Time (mantis #5972) | Olivier van Helden and Gudule Lapointe (Speculoos.net) | 2012-04-24 | 1 | -1/+15 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2012-03-08 | 1 | -3/+3 |
|\ \ | |/ | |||||
| * | Change "help" to display categories/module list then "help ↵ | Justin Clark-Casey (justincc) | 2012-03-08 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | <category/module>" to display commands in a category. This is to deal with the hundred lines of command splurge when one previously typed "help" Modelled somewhat on the mysql console One can still type help <command> to get per command help at any point. Categories capitalized to avoid conflict with the all-lowercase commands (except for commander system, as of yet). Does not affect command parsing or any other aspects of the console apart from the help system. Backwards compatible with existing modules. | ||||
* | | Merge branch 'master' into careminster | Melanie | 2012-03-04 | 2 | -2/+42 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs | ||||
| * | V3 Support | BlueWall | 2012-02-22 | 2 | -2/+22 |
| | | | | | | | | The V3 webapps need SSO capability and use OpenID. We need to send both our OpenID server url and a token for the user in the login response. | ||||
| * | V3 Support: | BlueWall | 2012-02-21 | 2 | -2/+22 |
| | | | | | | | | This starts V3 support by adding a profile server url to the login response. This requires viewer support - which is also being worked on. | ||||
* | | Merge branch 'master' into careminster | Melanie | 2012-02-18 | 1 | -0/+2 |
|\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs | ||||
| * | Propagate our teleport flags on logins | BlueWall | 2012-02-18 | 1 | -0/+2 |
| | | |||||
* | | 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-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. | ||||
* | | Resolve merge commits, stage 1 | Tom | 2011-09-04 | 2 | -4/+23 |
|\ \ | |/ | |||||
| * | minor: comment out friends number logging from login for now | Justin Clark-Casey (justincc) | 2011-08-30 | 1 | -1/+1 |
| | | |||||
| * | Added optional Login Service parameter "Currency" to be able to change the ↵ | Snoopy Pfeffer | 2011-08-14 | 2 | -2/+21 |
| | | | | | | | | currency name shown in the viewer. | ||||
| * | Get rid of AvatarAppearance.Owner to simplify the code. | Justin Clark-Casey (justincc) | 2011-08-02 | 1 | -1/+1 |
| | | | | | | | | 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. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-06-13 | 1 | -0/+8 |
|\ \ | |/ | |||||
| * | People are bound to forget the '/' at the end of MapTileURL, so let's ↵ | Diva Canto | 2011-06-12 | 1 | -0/+8 |
| | | | | | | | | correct that from the inside. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-06-09 | 2 | -14/+48 |
|\ \ | |/ | |||||
| * | Add alternate region handling for url based logins as found in login to ↵ | BlueWall | 2011-06-01 | 1 | -3/+15 |
| | | | | | | | | "home" or "last" | ||||
| * | Added necessary code to drop inventory on hg friends using the profile ↵ | Diva Canto | 2011-05-24 | 1 | -10/+20 |
| | | | | | | | | window, but can't test because this mechanism doesn't seem to work without a profile service. | ||||
| * | More on HG Friends. Added Delete(string, string) across the board. Added ↵ | Diva Canto | 2011-05-22 | 1 | -1/+1 |
| | | | | | | | | 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. | ||||
| * | HG Friends working to some extent: friendships offered and accepted ↵ | Diva Canto | 2011-05-19 | 1 | -1/+13 |
| | | | | | | | | correctly handled. Friends list showing correct foreign names. TODO: GrantRights. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-05-05 | 2 | -2/+0 |
|\ \ | |/ | |||||
| * | Renamed OpenSim.Framework.Capabilities.dll to OpenSim.Capabilities.dll | Diva Canto | 2011-04-30 | 2 | -2/+0 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-30 | 1 | -3/+37 |
|\ \ | |/ | |||||
| * | Thank you Snoopy for a patch that adds some filtering to client versions ↵ | Diva Canto | 2011-04-27 | 1 | -3/+37 |
| | | | | | | | | allowed at login and HG-login times. NOTE: additional (optional) configuration variables in [LoginService] and [GatekeeperService]. See .examples. | ||||
| * | Also set Godlike flag. Might be useful | Melanie | 2011-01-27 | 1 | -0/+2 |
| | | |||||
| * | Add TeleportFlags.ViaRegionID to the flags sent on login when the region | Melanie | 2011-01-27 | 1 | -8/+13 |
| | | | | | | | | | | was entered by hand to determine whether or not to honor the landing point | ||||
* | | Also set Godlike flag. Might be useful | Melanie | 2011-01-27 | 1 | -0/+2 |
| | | |||||
* | | Add TeleportFlags.ViaRegionID to the flags sent on login when the region | Melanie | 2011-01-27 | 1 | -8/+13 |
| | | | | | | | | | | was entered by hand to determine whether or not to honor the landing point | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-01-18 | 2 | -2/+2 |
|\ \ | |/ | |||||
| * | Prune some of the excess logging for client logins. | Justin Clark-Casey (justincc) | 2011-01-18 | 2 | -2/+2 |
| | | | | | | | | Didn't touch the appearance related stuff. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-12 | 1 | -0/+5 |
|\ \ | |/ | |||||
| * | Normalized ALL URLs with trailing /'s hopefully. Fixed show hyperlinks ↵ | Diva Canto | 2010-12-09 | 1 | -0/+5 |
| | | | | | | | | command. mantis #5259 | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-06 | 2 | -32/+4 |
|\ \ | |/ | |||||
| * | Fixed some inconsistency with trailing /. Made debug messages consistent. ↵ | Diva Canto | 2010-12-05 | 1 | -2/+2 |
| | | | | | | | | Changed the stored region names of HG regions. Increased the size of regionName in DB. | ||||
| * | Merge branch 'master-core' into mantis5110 | Jonathan Freedman | 2010-12-05 | 1 | -0/+16 |
| |\ | |||||
| * \ | Merge branch 'master-core' into mantis5110 | Jonathan Freedman | 2010-11-21 | 1 | -10/+30 |
| |\ \ | |||||
| * \ \ | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-29 | 1 | -5/+5 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| * | | | | * a bit of additional debugging: | Jonathan Freedman | 2010-10-23 | 1 | -4/+3 |
| | | | | | |||||
* | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-03 | 1 | -0/+16 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | Also prevent god takes from ending up in Lost and Found | ||||
| * | | | | WARNING: LOTS OF CONFIGURATION CHANGES AFFECTING PRIMARILY HG CONFIGS. Added ↵ | Diva Canto | 2010-11-25 | 1 | -0/+16 |
| | |_|/ | |/| | | | | | | | | | | capability to preserve creator information on HG asset transfers. Added a new HGAssetService that is intended to be the one outside the firewall. It processes and filters the assets that go out of the grid. Also fixed the normal AssetService to do special things for the main instance (console commands, etc). Moved HGInventoryService to OpenSim.Services.HypergridService. Changed the way the login service gets the ServiceURL configs. | ||||
* | | | | Add the ability for gods to impersonate users. For this, bit 6 needs to be | Melanie | 2010-11-25 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | set in the target's UserFlags and the impersonator must have UserLevel 200 or above. The user can then log in using the target's name and their own password. | ||||
* | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-17 | 1 | -10/+30 |
|\ \ \ \ | |/ / / | |||||
| * | | | Do not include hyperlinks in a random region search during a login. | Marck | 2010-11-13 | 1 | -10/+30 |
| | | | | | | | | | | | | | | | | Before a random region is chosen, available fallback regions are used for the login. |